@@ -383,6 +383,9 @@ int main(int argc, char * argv[])
383
383
if (argc == 2 && strcmp (argv[1 ]," --auto_config" )==0 )
384
384
{
385
385
printf (" CMD .png .dds \" %s\" DDS_MODE HAS_MIPS PVR_SCALE \" INFILE\" \" OUTFILE\"\n " ,argv[0 ]);
386
+ printf (" CMD .jpg .dds \" %s\" DDS_MODE HAS_MIPS PVR_SCALE \" INFILE\" \" OUTFILE\"\n " , argv[0 ]);
387
+ printf (" CMD .tif .dds \" %s\" DDS_MODE HAS_MIPS PVR_SCALE \" INFILE\" \" OUTFILE\"\n " , argv[0 ]);
388
+ printf (" CMD .bmp .dds \" %s\" DDS_MODE HAS_MIPS PVR_SCALE \" INFILE\" \" OUTFILE\"\n " , argv[0 ]);
386
389
printf (" OPTIONS DDSTool\n " );
387
390
printf (" RADIO DDS_MODE 1 --png2dxt Auto-pick compression\n " );
388
391
printf (" RADIO DDS_MODE 0 --png2dxt1 BC1/DXT1 Compression (1-bit alpha)\n " );
@@ -467,7 +470,7 @@ int main(int argc, char * argv[])
467
470
bool one_file = false ;
468
471
469
472
if (strcmp (argv[n]," --one_file" )==0 ) { ++n; one_file = true ; }
470
- if (CreateBitmapFromPNG (argv[n], &info, true , GAMMA_SRGB ))
473
+ if (LoadBitmapFromAnyFile (argv[n], &info))
471
474
{
472
475
printf (" Unable to open png file %s\n " , argv[n]);
473
476
return 1 ;
@@ -680,7 +683,7 @@ int main(int argc, char * argv[])
680
683
}
681
684
682
685
ImageInfo info;
683
- if (CreateBitmapFromPNG (argv[arg_base], &info, bc_type == 0 , GAMMA_SRGB ))
686
+ if (LoadBitmapFromAnyFile (argv[arg_base], &info))
684
687
{
685
688
printf (" Unable to open png file %s\n " , argv[arg_base]);
686
689
return 1 ;
0 commit comments