Merge branch 'read_only' into 'master'

Take into account PACKBITS_READ_ONLY, LZW_READ_ONLY, and LERC_READ_ONLY macros

See merge request libtiff/libtiff!683

Author: rouault

libtiff/tif_lerc.c

@@ -93,7 +93,6 @@ typedef struct
 #define LERCDecoderState(tif) GetLERCState(tif)
 #define LERCEncoderState(tif) GetLERCState(tif)
 
-static int LERCEncode(TIFF *tif, uint8_t *bp, tmsize_t cc, uint16_t s);
 static int LERCDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s);
 
 static int LERCFixupTags(TIFF *tif)
@@ -222,20 +221,20 @@ static int SetupBuffers(TIFF *tif, LERCState *sp, const char *module)
     {
         TIFFErrorExtR(tif, module, "Too large uncompressed strip/tile");
         _TIFFfreeExt(tif, sp->uncompressed_buffer);
-        sp->uncompressed_buffer = 0;
+        sp->uncompressed_buffer = NULL;
         sp->uncompressed_alloc = 0;
         return 0;
     }
 
     if (sp->uncompressed_alloc < new_alloc)
     {
         _TIFFfreeExt(tif, sp->uncompressed_buffer);
-        sp->uncompressed_buffer = _TIFFmallocExt(tif, new_alloc);
+        sp->uncompressed_buffer = (uint8_t *)_TIFFmallocExt(tif, new_alloc);
         if (!sp->uncompressed_buffer)
         {
             TIFFErrorExtR(tif, module, "Cannot allocate buffer");
             _TIFFfreeExt(tif, sp->uncompressed_buffer);
-            sp->uncompressed_buffer = 0;
+            sp->uncompressed_buffer = NULL;
             sp->uncompressed_alloc = 0;
             return 0;
         }
@@ -267,7 +266,7 @@ static int SetupBuffers(TIFF *tif, LERCState *sp, const char *module)
                 TIFFErrorExtR(tif, module, "Cannot allocate buffer");
                 sp->mask_size = 0;
                 _TIFFfreeExt(tif, sp->uncompressed_buffer);
-                sp->uncompressed_buffer = 0;
+                sp->uncompressed_buffer = NULL;
                 sp->uncompressed_alloc = 0;
                 return 0;
             }
@@ -348,7 +347,7 @@ static int LERCPreDecode(TIFF *tif, uint16_t s)
             return 0;
         }
         assert(lerc_data_sizet == (unsigned int)lerc_data_sizet);
-        lerc_data = sp->compressed_buffer;
+        lerc_data = (uint8_t *)sp->compressed_buffer;
         lerc_data_size = (unsigned int)lerc_data_sizet;
 #else
         z_stream strm;
@@ -369,15 +368,15 @@ static int LERCPreDecode(TIFF *tif, uint16_t s)
         strm.avail_in = (uInt)tif->tif_rawcc;
         strm.next_in = tif->tif_rawcp;
         strm.avail_out = sp->compressed_size;
-        strm.next_out = sp->compressed_buffer;
+        strm.next_out = (Bytef *)sp->compressed_buffer;
         zlib_ret = inflate(&strm, Z_FINISH);
         if (zlib_ret != Z_STREAM_END && zlib_ret != Z_OK)
         {
             TIFFErrorExtR(tif, module, "inflate() failed");
             inflateEnd(&strm);
             return 0;
         }
-        lerc_data = sp->compressed_buffer;
+        lerc_data = (uint8_t *)sp->compressed_buffer;
         lerc_data_size = sp->compressed_size - strm.avail_out;
         inflateEnd(&strm);
 #endif
@@ -396,7 +395,7 @@ static int LERCPreDecode(TIFF *tif, uint16_t s)
             return 0;
         }
 
-        lerc_data = sp->compressed_buffer;
+        lerc_data = (uint8_t *)sp->compressed_buffer;
         lerc_data_size = (unsigned int)zstd_ret;
 #else
         TIFFErrorExtR(tif, module, "ZSTD support missing");
@@ -568,7 +567,7 @@ static int LERCPreDecode(TIFF *tif, uint16_t s)
         {
             _TIFFfreeExt(tif, sp->uncompressed_buffer_multiband);
             sp->uncompressed_buffer_multiband =
-                _TIFFmallocExt(tif, num_bytes_needed);
+                (uint8_t *)_TIFFmallocExt(tif, num_bytes_needed);
             if (!sp->uncompressed_buffer_multiband)
             {
                 sp->uncompressed_buffer_multiband_alloc = 0;
@@ -752,7 +751,7 @@ static int LERCDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
     assert(sp != NULL);
     assert(sp->state == LSTATE_INIT_DECODE);
 
-    if (sp->uncompressed_buffer == 0)
+    if (sp->uncompressed_buffer == NULL)
     {
         memset(op, 0, (size_t)occ);
         TIFFErrorExtR(tif, module, "Uncompressed buffer not allocated");
@@ -773,6 +772,8 @@ static int LERCDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
     return 1;
 }
 
+#ifndef LERC_READ_ONLY
+
 static int LERCSetupEncode(TIFF *tif)
 {
     LERCState *sp = LERCEncoderState(tif);
@@ -1005,7 +1006,7 @@ static int LERCPostEncode(TIFF *tif)
                 {
                     _TIFFfreeExt(tif, sp->uncompressed_buffer_multiband);
                     sp->uncompressed_buffer_multiband =
-                        _TIFFmallocExt(tif, num_bytes_needed);
+                        (uint8_t *)_TIFFmallocExt(tif, num_bytes_needed);
                     if (!sp->uncompressed_buffer_multiband)
                     {
                         sp->uncompressed_buffer_multiband_alloc = 0;
@@ -1126,7 +1127,8 @@ static int LERCPostEncode(TIFF *tif)
             sp->uncompressed_buffer_multiband, sp->lerc_version,
             GetLercDataType(tif), 1, sp->segment_width, sp->segment_height,
             dst_nbands, dst_nbands, sp->mask_buffer, sp->maxzerror,
-            sp->compressed_buffer, sp->compressed_size, &numBytesWritten);
+            (unsigned char *)sp->compressed_buffer, sp->compressed_size,
+            &numBytesWritten);
     }
     else
 #endif
@@ -1139,7 +1141,8 @@ static int LERCPostEncode(TIFF *tif)
             use_mask ? 1 : 0,
 #endif
             use_mask ? sp->mask_buffer : NULL, sp->maxzerror,
-            sp->compressed_buffer, sp->compressed_size, &numBytesWritten);
+            (unsigned char *)sp->compressed_buffer, sp->compressed_size,
+            &numBytesWritten);
     }
     if (lerc_ret != 0)
     {
@@ -1271,7 +1274,7 @@ static int LERCPostEncode(TIFF *tif)
     {
         int ret;
         uint8_t *tif_rawdata_backup = tif->tif_rawdata;
-        tif->tif_rawdata = sp->compressed_buffer;
+        tif->tif_rawdata = (uint8_t *)sp->compressed_buffer;
         tif->tif_rawcc = numBytesWritten;
         ret = TIFFFlushData1(tif);
         tif->tif_rawdata = tif_rawdata_backup;
@@ -1282,11 +1285,13 @@ static int LERCPostEncode(TIFF *tif)
     return 1;
 }
 
+#endif /* LERC_READ_ONLY */
+
 static void LERCCleanup(TIFF *tif)
 {
     LERCState *sp = GetLERCState(tif);
 
-    assert(sp != 0);
+    assert(sp != NULL);
 
     tif->tif_tagmethods.vgetfield = sp->vgetparent;
     tif->tif_tagmethods.vsetfield = sp->vsetparent;
@@ -1312,20 +1317,21 @@ static void LERCCleanup(TIFF *tif)
 static const TIFFField LERCFields[] = {
     {TIFFTAG_LERC_PARAMETERS, TIFF_VARIABLE2, TIFF_VARIABLE2, TIFF_LONG, 0,
      TIFF_SETGET_C32_UINT32, TIFF_SETGET_UNDEFINED, FIELD_CUSTOM, FALSE, TRUE,
-     "LercParameters", NULL},
+     (char *)"LercParameters", NULL},
     {TIFFTAG_LERC_MAXZERROR, 0, 0, TIFF_ANY, 0, TIFF_SETGET_DOUBLE,
-     TIFF_SETGET_UNDEFINED, FIELD_PSEUDO, TRUE, FALSE, "LercMaximumError",
-     NULL},
+     TIFF_SETGET_UNDEFINED, FIELD_PSEUDO, TRUE, FALSE,
+     (char *)"LercMaximumError", NULL},
     {TIFFTAG_LERC_VERSION, 0, 0, TIFF_ANY, 0, TIFF_SETGET_UINT32,
-     TIFF_SETGET_UNDEFINED, FIELD_PSEUDO, FALSE, FALSE, "LercVersion", NULL},
+     TIFF_SETGET_UNDEFINED, FIELD_PSEUDO, FALSE, FALSE, (char *)"LercVersion",
+     NULL},
     {TIFFTAG_LERC_ADD_COMPRESSION, 0, 0, TIFF_ANY, 0, TIFF_SETGET_UINT32,
      TIFF_SETGET_UNDEFINED, FIELD_PSEUDO, FALSE, FALSE,
-     "LercAdditionalCompression", NULL},
+     (char *)"LercAdditionalCompression", NULL},
     {TIFFTAG_ZSTD_LEVEL, 0, 0, TIFF_ANY, 0, TIFF_SETGET_INT,
      TIFF_SETGET_UNDEFINED, FIELD_PSEUDO, TRUE, FALSE,
-     "ZSTD zstd_compress_level", NULL},
+     (char *)"ZSTD zstd_compress_level", NULL},
     {TIFFTAG_ZIPQUALITY, 0, 0, TIFF_ANY, 0, TIFF_SETGET_INT,
-     TIFF_SETGET_UNDEFINED, FIELD_PSEUDO, TRUE, FALSE, "", NULL},
+     TIFF_SETGET_UNDEFINED, FIELD_PSEUDO, TRUE, FALSE, (char *)"", NULL},
 };
 
 static int LERCVSetFieldBase(TIFF *tif, uint32_t tag, ...)
@@ -1517,12 +1523,14 @@ int TIFFInitLERC(TIFF *tif, int scheme)
     tif->tif_decoderow = LERCDecode;
     tif->tif_decodestrip = LERCDecode;
     tif->tif_decodetile = LERCDecode;
+#ifndef LERC_READ_ONLY
     tif->tif_setupencode = LERCSetupEncode;
     tif->tif_preencode = LERCPreEncode;
     tif->tif_postencode = LERCPostEncode;
     tif->tif_encoderow = LERCEncode;
     tif->tif_encodestrip = LERCEncode;
     tif->tif_encodetile = LERCEncode;
+#endif
     tif->tif_cleanup = LERCCleanup;
 
     /* Default values for codec-specific fields */

libtiff/tif_lzw.c

@@ -168,7 +168,6 @@ static int LZWDecode(TIFF *tif, uint8_t *op0, tmsize_t occ0, uint16_t s);
 #ifdef LZW_COMPAT
 static int LZWDecodeCompat(TIFF *tif, uint8_t *op0, tmsize_t occ0, uint16_t s);
 #endif
-static void cl_hash(LZWCodecState *);
 
 /*
  * LZW Decoder.
@@ -1017,6 +1016,10 @@ static int LZWDecodeCompat(TIFF *tif, uint8_t *op0, tmsize_t occ0, uint16_t s)
 }
 #endif /* LZW_COMPAT */
 
+#ifndef LZW_READ_ONLY
+
+static void cl_hash(LZWCodecState *);
+
 /*
  * LZW Encoding.
  */
@@ -1373,6 +1376,8 @@ static void cl_hash(LZWCodecState *sp)
         hp->hash = -1;
 }
 
+#endif
+
 static void LZWCleanup(TIFF *tif)
 {
     (void)TIFFPredictorCleanup(tif);
@@ -1416,12 +1421,14 @@ int TIFFInitLZW(TIFF *tif, int scheme)
     tif->tif_decoderow = LZWDecode;
     tif->tif_decodestrip = LZWDecode;
     tif->tif_decodetile = LZWDecode;
+#ifndef LZW_READ_ONLY
     tif->tif_setupencode = LZWSetupEncode;
     tif->tif_preencode = LZWPreEncode;
     tif->tif_postencode = LZWPostEncode;
     tif->tif_encoderow = LZWEncode;
     tif->tif_encodestrip = LZWEncode;
     tif->tif_encodetile = LZWEncode;
+#endif
     tif->tif_cleanup = LZWCleanup;
     /*
      * Setup predictor setup.

libtiff/tif_packbits.c

@@ -31,6 +31,8 @@
  */
 #include <stdio.h>
 
+#ifndef PACKBITS_READ_ONLY
+
 static int PackBitsPreEncode(TIFF *tif, uint16_t s)
 {
     (void)s;
@@ -231,6 +233,8 @@ static int PackBitsEncodeChunk(TIFF *tif, uint8_t *bp, tmsize_t cc, uint16_t s)
     return (1);
 }
 
+#endif
+
 static int PackBitsDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
 {
     static const char module[] = "PackBitsDecode";
@@ -314,11 +318,13 @@ int TIFFInitPackBits(TIFF *tif, int scheme)
     tif->tif_decoderow = PackBitsDecode;
     tif->tif_decodestrip = PackBitsDecode;
     tif->tif_decodetile = PackBitsDecode;
+#ifndef PACKBITS_READ_ONLY
     tif->tif_preencode = PackBitsPreEncode;
     tif->tif_postencode = PackBitsPostEncode;
     tif->tif_encoderow = PackBitsEncode;
     tif->tif_encodestrip = PackBitsEncodeChunk;
     tif->tif_encodetile = PackBitsEncodeChunk;
+#endif
     return (1);
 }
 #endif /* PACKBITS_SUPPORT */