View Issue Details

IDProjectCategoryView StatusLast Update
0035038LazarusLCLpublic2019-02-08 18:20
ReporterAlexey Tor.Assigned ToMichl 
PrioritynormalSeverityminorReproducibilityN/A
Status resolvedResolutionfixed 
Product Version2.1 (SVN)Product Build 
Target Version2.0.2Fixed in Version2.1 (SVN) 
Summary0035038: Define DisableLCLTiff used more
DescriptionUnit intfgraphics.pas has TIFF code, which don't utilize %subj% FPC define (while graphics unit does it).
Patch attached.
TagsNo tags attached.
Fixed in Revision60364
LazTarget-
Widgetset
Attached Files
  • tif.diff (1,274 bytes)
    Index: lcl/intfgraphics.pas
    ===================================================================
    --- lcl/intfgraphics.pas	(revision 60350)
    +++ lcl/intfgraphics.pas	(working copy)
    @@ -26,8 +26,13 @@
     
     uses
       // RTL + FCL
    -  Classes, SysUtils, Math, fpImage, FPReadBMP, FPWriteBMP, BMPComn,
    -  FPReadPNG, FPWritePNG, FPReadTiff, FPWriteTiff, FPTiffCmn, Laz_AVL_Tree,
    +  Classes, SysUtils, Math, fpImage, 
    +  FPReadBMP, FPWriteBMP, BMPComn,
    +  FPReadPNG, FPWritePNG, 
    +  {$IFNDEF DisableLCLTIFF}
    +  FPReadTiff, FPWriteTiff, FPTiffCmn, 
    +  {$ENDIF}
    +  Laz_AVL_Tree,
       // LazUtils
       FPCAdds, LazLoggerBase, LazTracer,
       // LCL
    @@ -581,6 +586,8 @@
         procedure Finalize;
       end;
     
    +{$IFNDEF DisableLCLTIFF}
    +
       { TLazReaderTiff }
     
     const
    @@ -633,8 +640,9 @@
         procedure Initialize(AImage: TLazIntfImage);
         procedure Finalize;
       end;
    +  
    +{$ENDIF} //DisableLCLTIFF
     
    -
       { TLazReaderIcnsPart }
     
       TLazReaderIcnsPart = class(TFPCustomImageReader, ILazImageReader)
    @@ -6147,6 +6155,8 @@
       Result := -1;
     end;
     
    +{$IFNDEF DisableLCLTIFF}
    +
     { TLazReaderTiff }
     
     {$IFDEF OldTiffCreateImageHook}
    @@ -6320,6 +6330,8 @@
       Result := -1;
     end;
     
    +{$ENDIF} //DisableLCLTIFF
    +
     { TLazReaderIcnsPart }
     
     function TLazReaderIcnsPart.InternalCheck(Str: TStream): boolean;
    
    tif.diff (1,274 bytes)

Activities

Alexey Tor.

2019-02-07 23:05

reporter  

tif.diff (1,274 bytes)
Index: lcl/intfgraphics.pas
===================================================================
--- lcl/intfgraphics.pas	(revision 60350)
+++ lcl/intfgraphics.pas	(working copy)
@@ -26,8 +26,13 @@
 
 uses
   // RTL + FCL
-  Classes, SysUtils, Math, fpImage, FPReadBMP, FPWriteBMP, BMPComn,
-  FPReadPNG, FPWritePNG, FPReadTiff, FPWriteTiff, FPTiffCmn, Laz_AVL_Tree,
+  Classes, SysUtils, Math, fpImage, 
+  FPReadBMP, FPWriteBMP, BMPComn,
+  FPReadPNG, FPWritePNG, 
+  {$IFNDEF DisableLCLTIFF}
+  FPReadTiff, FPWriteTiff, FPTiffCmn, 
+  {$ENDIF}
+  Laz_AVL_Tree,
   // LazUtils
   FPCAdds, LazLoggerBase, LazTracer,
   // LCL
@@ -581,6 +586,8 @@
     procedure Finalize;
   end;
 
+{$IFNDEF DisableLCLTIFF}
+
   { TLazReaderTiff }
 
 const
@@ -633,8 +640,9 @@
     procedure Initialize(AImage: TLazIntfImage);
     procedure Finalize;
   end;
+  
+{$ENDIF} //DisableLCLTIFF
 
-
   { TLazReaderIcnsPart }
 
   TLazReaderIcnsPart = class(TFPCustomImageReader, ILazImageReader)
@@ -6147,6 +6155,8 @@
   Result := -1;
 end;
 
+{$IFNDEF DisableLCLTIFF}
+
 { TLazReaderTiff }
 
 {$IFDEF OldTiffCreateImageHook}
@@ -6320,6 +6330,8 @@
   Result := -1;
 end;
 
+{$ENDIF} //DisableLCLTIFF
+
 { TLazReaderIcnsPart }
 
 function TLazReaderIcnsPart.InternalCheck(Str: TStream): boolean;
tif.diff (1,274 bytes)

Michl

2019-02-08 18:20

developer   ~0113949

Applied. Thank you!

Issue History

Date Modified Username Field Change
2019-02-07 23:05 Alexey Tor. New Issue
2019-02-07 23:05 Alexey Tor. File Added: tif.diff
2019-02-07 23:15 Michl Assigned To => Michl
2019-02-07 23:15 Michl Status new => assigned
2019-02-08 18:20 Michl Fixed in Revision => 60364
2019-02-08 18:20 Michl LazTarget => -
2019-02-08 18:20 Michl Note Added: 0113949
2019-02-08 18:20 Michl Status assigned => resolved
2019-02-08 18:20 Michl Fixed in Version => 2.1 (SVN)
2019-02-08 18:20 Michl Resolution open => fixed
2019-02-08 18:20 Michl Target Version => 2.0.2