Browse Source

fcl-image: write tif: use compression number DeflateAdobe, not obsolete DeflateZLib

git-svn-id: trunk@42586 -
Mattias Gaertner 6 years ago
parent
commit
fb27e7f4c3
2 changed files with 6 additions and 4 deletions
  1. 3 1
      packages/fcl-image/src/fptiffcmn.pas
  2. 3 3
      packages/fcl-image/src/fpwritetiff.pas

+ 3 - 1
packages/fcl-image/src/fptiffcmn.pas

@@ -88,7 +88,9 @@ const
   TiffCompressionIT8BL = 32898; { IT8BL }
   TiffCompressionIT8BL = 32898; { IT8BL }
   TiffCompressionPixarFilm = 32908; { PIXARFILM }
   TiffCompressionPixarFilm = 32908; { PIXARFILM }
   TiffCompressionPixarLog = 32909; { PIXARLOG }
   TiffCompressionPixarLog = 32909; { PIXARLOG }
-  TiffCompressionDeflateZLib = 32946; { DeflatePKZip }
+  TiffCompressionDeflateZLib = 32946; { DeflatePKZip - obsolete,
+       same as TiffCompressionDeflateAdobe,
+       Macos Finder does not like this, use Adobe instead }
   TiffCompressionDCS = 32947; { DCS }
   TiffCompressionDCS = 32947; { DCS }
   TiffCompressionJBIG = 34661; { JBIG }
   TiffCompressionJBIG = 34661; { JBIG }
   TiffCompressionSGILog = 34676; { SGILOG }
   TiffCompressionSGILog = 34676; { SGILOG }

+ 3 - 3
packages/fcl-image/src/fpwritetiff.pas

@@ -464,12 +464,12 @@ begin
     Compression:=IFD.Compression;
     Compression:=IFD.Compression;
     case Compression of
     case Compression of
     TiffCompressionNone,
     TiffCompressionNone,
-    TiffCompressionDeflateZLib: ;
+    TiffCompressionDeflateAdobe: ;
     else
     else
       {$ifdef FPC_DEBUG_IMAGE}
       {$ifdef FPC_DEBUG_IMAGE}
       writeln('TFPWriterTiff.AddImage unsupported compression '+TiffCompressionName(Compression)+', using deflate instead.');
       writeln('TFPWriterTiff.AddImage unsupported compression '+TiffCompressionName(Compression)+', using deflate instead.');
       {$endif}
       {$endif}
-      Compression:=TiffCompressionDeflateZLib;
+      Compression:=TiffCompressionDeflateAdobe;
     end;
     end;
 
 
     if IFD.Orientation in [1..4] then begin
     if IFD.Orientation in [1..4] then begin
@@ -698,7 +698,7 @@ t=',ChunkCount);
 
 
         // compress
         // compress
         case Compression of
         case Compression of
-        TiffCompressionDeflateZLib: EncodeDeflate(Chunk,ChunkBytes);
+        TiffCompressionDeflateZLib, TiffCompressionDeflateAdobe: EncodeDeflate(Chunk,ChunkBytes);
         end;
         end;
 
 
         ChunkOffsets.Chunks[ChunkIndex].Data:=Chunk;
         ChunkOffsets.Chunks[ChunkIndex].Data:=Chunk;