[Jcl-checkins-diff] SF.net SVN: jcl:[3315] trunk/jcl/source/common/JclCompression.pas

[<ob...@us...>]

Revision: 3315
          http://jcl.svn.sourceforge.net/jcl/?rev=3315&view=rev
Author:   obones
Date:     2010-08-16 08:48:20 +0000 (Mon, 16 Aug 2010)

Log Message:
-----------
RFC1952 specifies it should be ANSI

Modified Paths:
--------------
    trunk/jcl/source/common/JclCompression.pas

Modified: trunk/jcl/source/common/JclCompression.pas
===================================================================
--- trunk/jcl/source/common/JclCompression.pas	2010-08-16 08:42:34 UTC (rev 3314)
+++ trunk/jcl/source/common/JclCompression.pas	2010-08-16 08:48:20 UTC (rev 3315)
@@ -1,4 +1,4 @@
-{**************************************************************************************************}
+{**************************************************************************************************}
 {                                                                                                  }
 { Project JEDI Code Library (JCL)                                                                  }
 {                                                                                                  }
@@ -2719,7 +2719,7 @@
   AHeader: TJclGZIPHeader;
   ExtraFieldLength, HeaderCRC16: Word;
   HeaderCRC: Cardinal;
-  TmpUTF8String: {$IFDEF UNICODE}UTF8String{$ELSE}AnsiString{$ENDIF UNICODE};
+  TmpAnsiString: AnsiString;
 
   procedure StreamWriteBuffer(const Buffer; Count: Longint);
   begin
@@ -2790,8 +2790,8 @@
     if not CheckCString(OriginalFileName) then
       raise EJclCompressionError.CreateRes(@RsCompressionGZIPBadString);
 
-    TmpUTF8String := UTF8Encode(OriginalFileName);
-    StreamWriteBuffer(TmpUTF8String[1], Length(TmpUTF8String) + 1);
+    TmpAnsiString := AnsiString(OriginalFileName);
+    StreamWriteBuffer(TmpAnsiString[1], Length(TmpAnsiString) + 1);
   end;
 
   if (gfComment in Flags) and (Comment <> '') then
@@ -2799,8 +2799,8 @@
     if not CheckCString(Comment) then
       raise EJclCompressionError.CreateRes(@RsCompressionGZIPBadString);
 
-    TmpUTF8String := UTF8Encode(Comment);
-    StreamWriteBuffer(TmpUTF8String[1], Length(TmpUTF8String) + 1);
+    TmpAnsiString := AnsiString(Comment);
+    StreamWriteBuffer(TmpAnsiString[1], Length(TmpAnsiString) + 1);
   end;
 
   if (gfHeaderCRC16 in Flags) then


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.