Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use pid to mark tmp file to fit parallelism #10

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

use pid to mark tmp file to fit parallelism #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09f102c
Update etcpack.cxx
QriDoki Feb 3, 2019
fa5ef69
Update etcpack.cxx
QriDoki Feb 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 29 additions & 12 deletions source/etcpack.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9453,21 +9453,36 @@ void uncompressFile(char *srcfile, uint8* &img, uint8 *&alphaimg, int& active_wi
// NO WARRANTY --- SEE STATEMENT IN TOP OF FILE (C) Ericsson AB 2005-2013. All Rights Reserved.
void writeOutputFile(char *dstfile, uint8* img, uint8* alphaimg, int width, int height)
{
char str[300];
int pid = GetCurrentProcessId();
//printf("pid %d\n", pid);
char str[2047];

char tmpppm[2047];
sprintf(tmpppm, "%dtmp.ppm", pid);
char alphaoutpgm[2047];
sprintf(alphaoutpgm, "%dalphaout.pgm", pid);
char delTmpFile[2047];

if(format!=ETC2PACKAGE_R_NO_MIPMAPS&&format!=ETC2PACKAGE_RG_NO_MIPMAPS)
{
fWritePPM("tmp.ppm",width,height,img,8,false);
printf("Saved file tmp.ppm \n\n");
fWritePPM(tmpppm, width, height, img, 8, false);
printf("Saved file s \n\n", tmpppm);
sprintf(delTmpFile, "del %s\n", tmpppm);
}
else if(format==ETC2PACKAGE_RG_NO_MIPMAPS)
{
fWritePPM("tmp.ppm",width,height,img,16,false);
fWritePPM(tmpppm, width, height, img, 16, false);
sprintf(delTmpFile, "del %s\n", tmpppm);
}
if (format == ETC2PACKAGE_RGBA_NO_MIPMAPS || format == ETC2PACKAGE_RGBA1_NO_MIPMAPS || format == ETC2PACKAGE_sRGBA_NO_MIPMAPS || format == ETC2PACKAGE_sRGBA1_NO_MIPMAPS) {

fWritePGM(alphaoutpgm, width, height, alphaimg, false, 8);
sprintf(delTmpFile, "del %s\n", alphaoutpgm);
}
if (format == ETC2PACKAGE_R_NO_MIPMAPS) {
fWritePGM(alphaoutpgm, width, height, alphaimg, false, 16);
sprintf(delTmpFile, "del %s\n", alphaoutpgm);
}
if(format==ETC2PACKAGE_RGBA_NO_MIPMAPS||format==ETC2PACKAGE_RGBA1_NO_MIPMAPS||format==ETC2PACKAGE_sRGBA_NO_MIPMAPS||format==ETC2PACKAGE_sRGBA1_NO_MIPMAPS)
fWritePGM("alphaout.pgm",width,height,alphaimg,false,8);
if(format==ETC2PACKAGE_R_NO_MIPMAPS)
fWritePGM("alphaout.pgm",width,height,alphaimg,false,16);

// Delete destination file if it exists
if(fileExist(dstfile))
Expand All @@ -9480,7 +9495,8 @@ void writeOutputFile(char *dstfile, uint8* img, uint8* alphaimg, int width, int
if(!strcmp(&dstfile[q],".ppm")&&format!=ETC2PACKAGE_R_NO_MIPMAPS)
{
// Already a .ppm file. Just rename.
sprintf(str,"move tmp.ppm %s\n",dstfile);
sprintf(str, "move %s %s\n", tmpppm, dstfile);
//sprintf(str,"move tmp.ppm %s\n",dstfile);
printf("Renaming destination file to %s\n",dstfile);
}
else
Expand Down Expand Up @@ -9512,18 +9528,19 @@ void writeOutputFile(char *dstfile, uint8* img, uint8* alphaimg, int width, int
}
else if(format==ETC2PACKAGE_R_NO_MIPMAPS)
{
sprintf(str,"magick convert alphaout.pgm %s\n",dstfile);
sprintf(str, "magick convert %s %s\n", alphaoutpgm, dstfile);
printf("Converting destination file from .pgm to %s\n",dstfile);
}
else
{
sprintf(str,"magick convert tmp.ppm %s\n",dstfile);
sprintf(str, "magick convert %s %s\n", tmpppm, dstfile);
printf("Converting destination file from .ppm to %s\n",dstfile);
}
}
// Execute system call
system(str);

system(delTmpFile);

free(img);
if(alphaimg!=NULL)
free(alphaimg);
Expand Down