changeset 25:a6e6f87414ea

Cosmetics.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 10 May 2017 14:10:45 +0300
parents 377dc78a052d
children a6e11adda0be
files Makefile bpgenc.c
diffstat 2 files changed, 15 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed May 10 14:09:07 2017 +0300
+++ b/Makefile	Wed May 10 14:10:45 2017 +0300
@@ -13,7 +13,6 @@
 USE_LIBEXIF=y
 
 # Compile bpgview (SDL and SDL_image libraries needed)
-
 USE_BPGVIEW=y
 # Enable it to use bit depths > 12 (need more tests to validate encoder)
 #USE_JCTVC_HIGH_BIT_DEPTH=y
@@ -159,19 +158,19 @@
 
 ifdef USE_JCTVC
 JCTVC_OBJS=$(addprefix jctvc/TLibEncoder/, SyntaxElementWriter.o TEncSbac.o \
-TEncBinCoderCABACCounter.o TEncGOP.o\
-TEncSampleAdaptiveOffset.o TEncBinCoderCABAC.o TEncAnalyze.o\
-TEncEntropy.o TEncTop.o SEIwrite.o TEncPic.o TEncRateCtrl.o\
-WeightPredAnalysis.o TEncSlice.o TEncCu.o NALwrite.o TEncCavlc.o\
-TEncSearch.o TEncPreanalyzer.o)
+	TEncBinCoderCABACCounter.o TEncGOP.o\
+	TEncSampleAdaptiveOffset.o TEncBinCoderCABAC.o TEncAnalyze.o\
+	TEncEntropy.o TEncTop.o SEIwrite.o TEncPic.o TEncRateCtrl.o\
+	WeightPredAnalysis.o TEncSlice.o TEncCu.o NALwrite.o TEncCavlc.o\
+	TEncSearch.o TEncPreanalyzer.o)
 JCTVC_OBJS+=jctvc/TLibVideoIO/TVideoIOYuv.o
 JCTVC_OBJS+=$(addprefix jctvc/TLibCommon/, TComWeightPrediction.o TComLoopFilter.o\
-TComBitStream.o TComMotionInfo.o TComSlice.o ContextModel3DBuffer.o\
-TComPic.o TComRdCostWeightPrediction.o TComTU.o TComPicSym.o\
-TComPicYuv.o TComYuv.o TComTrQuant.o TComInterpolationFilter.o\
-ContextModel.o TComSampleAdaptiveOffset.o SEI.o TComPrediction.o\
-TComDataCU.o TComChromaFormat.o Debug.o TComRom.o\
-TComPicYuvMD5.o TComRdCost.o TComPattern.o TComCABACTables.o)
+	TComBitStream.o TComMotionInfo.o TComSlice.o ContextModel3DBuffer.o\
+	TComPic.o TComRdCostWeightPrediction.o TComTU.o TComPicSym.o\
+	TComPicYuv.o TComYuv.o TComTrQuant.o TComInterpolationFilter.o\
+	ContextModel.o TComSampleAdaptiveOffset.o SEI.o TComPrediction.o\
+	TComDataCU.o TComChromaFormat.o Debug.o TComRom.o\
+	TComPicYuvMD5.o TComRdCost.o TComPattern.o TComCABACTables.o)
 JCTVC_OBJS+=jctvc/libmd5/libmd5.o
 JCTVC_OBJS+=jctvc/TAppEncCfg.o jctvc/TAppEncTop.o jctvc/program_options_lite.o 
 
--- a/bpgenc.c	Wed May 10 14:09:07 2017 +0300
+++ b/bpgenc.c	Wed May 10 14:10:45 2017 +0300
@@ -1130,7 +1130,7 @@
         !TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &img_spp) ||
         !TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &img_depth))
     {
-        fprintf(stderr, "TIFF file lacks basic fields!\n");
+        fprintf(stderr, "TIFF file '%s' lacks basic fields!\n", filename);
         goto err;
     }
 
@@ -1364,6 +1364,7 @@
     return img;
 }
 
+
 Image *read_png(BPGMetaData **pmd,
                 FILE *f, BPGColorSpaceEnum color_space, int out_bit_depth,
                 int limited_range, int premultiplied_alpha)
@@ -1850,6 +1851,7 @@
     return img;
 }
 
+
 static const char PROBE_TIFF_MAGIC_LE[] = { 'I', 'I', 42, 0 };
 static const char PROBE_TIFF_MAGIC_BE[] = { 'M', 'M', 0, 42 };
 #define PROBE_BUF_SIZE 8
@@ -3110,7 +3112,7 @@
            "-hash                include MD5 hash in HEVC bitstream\n"
            "-keepmetadata        keep the metadata (from JPEG: EXIF, ICC profile, XMP, from PNG: ICC profile)\n"
            "-v                   show debug messages\n"
-               );
+           );
     }
 
     exit(1);