cleanup

git-svn-id: https://www.ocp.inf.ethz.ch/svn/ocp/trunk@956 ee0346a5-954a-46bf-9309-d26f15615825

Author: fnecati

FreeImage/FreeImage.h

@@ -152,7 +152,7 @@ FI_STRUCT (FIMULTIBITMAP) { void *data; };
 #include <inttypes.h>
 typedef int32_t BOOL;
 typedef uint8_t BYTE;
-typedef uint16_t SIGNED16;
+typedef uint16_t WORD;
 typedef uint32_t DWORD;
 typedef int32_t LONG;
 typedef int64_t INT64;
@@ -161,7 +161,7 @@ typedef uint64_t UINT64;
 // MS is not C99 ISO compliant
 typedef long BOOL;
 typedef unsigned char BYTE;
-typedef unsigned short SIGNED16;
+typedef unsigned short WORD;
 typedef unsigned long DWORD;
 typedef long LONG;
 typedef signed __int64 INT64;
@@ -209,8 +209,8 @@ typedef struct tagBITMAPINFOHEADER{
   DWORD biSize;
   LONG  biWidth; 
   LONG  biHeight; 
-  SIGNED16  biPlanes; 
-  SIGNED16  biBitCount;
+  WORD  biPlanes; 
+  WORD  biBitCount;
   DWORD biCompression; 
   DWORD biSizeImage; 
   LONG  biXPelsPerMeter; 
@@ -237,18 +237,18 @@ typedef struct tagBITMAPINFO {
 /** 48-bit RGB 
 */
 typedef struct tagFIRGB16 {
-	SIGNED16 red;
-	SIGNED16 green;
-	SIGNED16 blue;
+	WORD red;
+	WORD green;
+	WORD blue;
 } FIRGB16;
 
 /** 64-bit RGBA
 */
 typedef struct tagFIRGBA16 {
-	SIGNED16 red;
-	SIGNED16 green;
-	SIGNED16 blue;
-	SIGNED16 alpha;
+	WORD red;
+	WORD green;
+	WORD blue;
+	WORD alpha;
 } FIRGBA16;
 
 /** 96-bit RGB Float
@@ -268,7 +268,7 @@ typedef struct tagFIRGBAF {
 	float alpha;
 } FIRGBAF;
 
-/** Data structure for COMPLEX32 type (complex number)
+/** Data structure for COMPLEX type (complex number)
 */
 typedef struct tagFICOMPLEX {
     /// real part
@@ -371,7 +371,7 @@ typedef struct tagFICOMPLEX {
 #define FIICC_COLOR_IS_CMYK		0x01
 
 FI_STRUCT (FIICCPROFILE) { 
-	SIGNED16    flags;	//! info flag
+	WORD    flags;	//! info flag
 	DWORD	size;	//! profile's size measured in bytes
 	void   *data;	//! points to a block of contiguous memory containing the profile
 };
@@ -1042,15 +1042,15 @@ DLL_API FITAG *DLL_CALLCONV FreeImage_CloneTag(FITAG *tag);
 // tag getters and setters
 DLL_API const char *DLL_CALLCONV FreeImage_GetTagKey(FITAG *tag);
 DLL_API const char *DLL_CALLCONV FreeImage_GetTagDescription(FITAG *tag);
-DLL_API SIGNED16 DLL_CALLCONV FreeImage_GetTagID(FITAG *tag);
+DLL_API WORD DLL_CALLCONV FreeImage_GetTagID(FITAG *tag);
 DLL_API FREE_IMAGE_MDTYPE DLL_CALLCONV FreeImage_GetTagType(FITAG *tag);
 DLL_API DWORD DLL_CALLCONV FreeImage_GetTagCount(FITAG *tag);
 DLL_API DWORD DLL_CALLCONV FreeImage_GetTagLength(FITAG *tag);
 DLL_API const void *DLL_CALLCONV FreeImage_GetTagValue(FITAG *tag);
 
 DLL_API BOOL DLL_CALLCONV FreeImage_SetTagKey(FITAG *tag, const char *key);
 DLL_API BOOL DLL_CALLCONV FreeImage_SetTagDescription(FITAG *tag, const char *description);
-DLL_API BOOL DLL_CALLCONV FreeImage_SetTagID(FITAG *tag, SIGNED16 id);
+DLL_API BOOL DLL_CALLCONV FreeImage_SetTagID(FITAG *tag, WORD id);
 DLL_API BOOL DLL_CALLCONV FreeImage_SetTagType(FITAG *tag, FREE_IMAGE_MDTYPE type);
 DLL_API BOOL DLL_CALLCONV FreeImage_SetTagCount(FITAG *tag, DWORD count);
 DLL_API BOOL DLL_CALLCONV FreeImage_SetTagLength(FITAG *tag, DWORD length);

FreeImage/FreeImageDll.Mod

@@ -487,26 +487,26 @@ TYPE
 
 	(* ****************************** *)
 	(*! used for easy accessing to pixels of various image types, see Scanline procs. ( Necati ) *)
-	PtrLineRGB* = POINTER {UNTRACED, UNSAFE}TO ARRAY OF RGBTRIPLE; (* for accessing 24 bit lines, RGB *)
-	PtrLineRGBA* = POINTER {UNTRACED, UNSAFE} TO ARRAY OF RGBQUAD; (* for accessing 32 bit lines, RGBA *)
-	PtrFISINT16* = POINTER {UNTRACED, UNSAFE} TO ARRAY OF SIGNED16; (* for 16 bit integers *)
-	PtrFIINT32* = POINTER {UNTRACED, UNSAFE} TO ARRAY OF SIGNED32; (* for 32 bit integers *)
-	PtrFIFLOAT* = POINTER {UNTRACED, UNSAFE} TO ARRAY OF FLOAT32; (* for 32 bit real *)
-	PtrFIDOUBLE* = POINTER {UNTRACED, UNSAFE}TO ARRAY OF FLOAT64; (* for 64 bit real *)
-
-	PtrFICOMPLEX* = POINTER {UNTRACED, UNSAFE} TO ARRAY OF FICOMPLEX; (* 2x64 bits real, Complex *)
-	PtrFIRGB16* = POINTER {UNTRACED, UNSAFE} TO ARRAY OF FIRGB16; (* for 48-bit RGB, 3x16 bits *)
-	PtrFIRGBA16* = POINTER {UNTRACED, UNSAFE} TO ARRAY OF FIRGBA16; (* 64-bit RGBA, 4x16 bits *)
-	PtrFIRGBF* = POINTER {UNTRACED, UNSAFE} TO ARRAY OF FIRGBF; (* 96-bit RGB Float, 3*32 bits *)
-	PtrFIRGBAF* = POINTER {UNTRACED, UNSAFE} TO ARRAY OF FIRGBAF; (* 128-bit RGBA Float, 4x32 bits *)
+	PtrLineRGB* = POINTER {UNTRACED, UNSAFE}TO ARRAY MAX(SIZE) OF RGBTRIPLE; (* for accessing 24 bit lines, RGB *)
+	PtrLineRGBA* = POINTER {UNTRACED, UNSAFE} TO ARRAY MAX(SIZE) OF RGBQUAD; (* for accessing 32 bit lines, RGBA *)
+	PtrFISINT16* = POINTER {UNTRACED, UNSAFE} TO ARRAY MAX(SIZE) OF SIGNED16; (* for 16 bit integers *)
+	PtrFIINT32* = POINTER {UNTRACED, UNSAFE} TO ARRAY MAX(SIZE) OF SIGNED32; (* for 32 bit integers *)
+	PtrFIFLOAT* = POINTER {UNTRACED, UNSAFE} TO ARRAY MAX(SIZE) OF FLOAT32; (* for 32 bit real *)
+	PtrFIDOUBLE* = POINTER {UNTRACED, UNSAFE}TO ARRAY MAX(SIZE) OF FLOAT64; (* for 64 bit real *)
+
+	PtrFICOMPLEX* = POINTER {UNTRACED, UNSAFE} TO ARRAY MAX(SIZE) OF FICOMPLEX; (* 2x64 bits real, Complex *)
+	PtrFIRGB16* = POINTER {UNTRACED, UNSAFE} TO ARRAY MAX(SIZE) OF FIRGB16; (* for 48-bit RGB, 3x16 bits *)
+	PtrFIRGBA16* = POINTER {UNTRACED, UNSAFE} TO ARRAY MAX(SIZE) OF FIRGBA16; (* 64-bit RGBA, 4x16 bits *)
+	PtrFIRGBF* = POINTER {UNTRACED, UNSAFE} TO ARRAY MAX(SIZE) OF FIRGBF; (* 96-bit RGB Float, 3*32 bits *)
+	PtrFIRGBAF* = POINTER {UNTRACED, UNSAFE} TO ARRAY MAX(SIZE) OF FIRGBAF; (* 128-bit RGBA Float, 4x32 bits *)
 
 	Palette* = ARRAY 256 OF RGBQUAD;
 	PtrPALETTE* = POINTER {UNTRACED, UNSAFE} TO Palette;
 
 	(* File IO routines *)
 	FHandle* =  ADDRESS;
-	PSint* = POINTER {UNTRACED, UNSAFE} TO ARRAY OF SIGNED16;
-	Pint* = POINTER {UNTRACED, UNSAFE} TO ARRAY OF SIGNED32;
+	PSint* = POINTER {UNTRACED, UNSAFE} TO ARRAY MAX(SIZE) OF SIGNED16;
+	Pint* = POINTER {UNTRACED, UNSAFE} TO ARRAY MAX(SIZE) OF SIGNED32;
 	FI_ReadProc* = PROCEDURE {PlatformCC} (buffer: ADDRESS; size: SIGNED32; count: SIGNED32; handle: FHandle): SIGNED32;
 	FI_WriteProc* = PROCEDURE {PlatformCC} (buffer: ADDRESS; size: SIGNED32; count: SIGNED32; handle: FHandle): SIGNED32;
 	FI_SeekProc* = PROCEDURE {PlatformCC} (handle: FHandle; offset: SIGNED32; origin: SIGNED32): PSint;
@@ -526,8 +526,8 @@ TYPE
 	FIMETADATA* = POINTER  {UNTRACED, UNSAFE} TO RECORD END; (* Handle to a metadata model *)
 	FITAG* = POINTER {UNTRACED, UNSAFE} TO RECORD END; (* Handle to a FreeImage tag *)
 
-	OutputMessageFunction* = PROCEDURE {PlatformCC} (fif: IMAGE_FORMAT; msg: POINTER  {UNSAFE} TO ARRAY OF CHAR);
-	OutputMessageFunctionStdCall* = PROCEDURE {PlatformCC} (fif: IMAGE_FORMAT;  msg: POINTER  {UNSAFE} TO ARRAY OF CHAR);
+	OutputMessageFunction* = PROCEDURE {PlatformCC} (fif: IMAGE_FORMAT; msg: POINTER  {UNSAFE} TO ARRAY 1024 OF CHAR);
+	OutputMessageFunctionStdCall* = PROCEDURE {PlatformCC} (fif: IMAGE_FORMAT;  msg: POINTER  {UNSAFE} TO ARRAY 1024 OF CHAR);
 
 
 CONST
@@ -1452,25 +1452,24 @@ BEGIN
 END OnClose;
 
 (* utilities  *)
-PROCEDURE GetStringFromAddr*(adr:  POINTER {UNSAFE} TO ARRAY OF CHAR ): Strings.String;
-VAR
+(* Get string from address *)
+PROCEDURE GetStringFromAddr*(adr: ADDRESS): Strings.String;
+VAR s: POINTER {UNSAFE} TO ARRAY MAX(SIZE) OF CHAR;
 	str: Strings.String;
-	pos: SIZE;
+	pos: SIGNED32;
 BEGIN
-
+	s := adr;
 	pos := 0;
 	IF adr # NIL THEN
-		WHILE adr[pos] # 0X DO INC(pos); END;
+		WHILE s[pos] # 0X DO INC(pos); END;
 		NEW(str, pos + 1);
 		pos := 0;
-		WHILE adr[pos] # 0X DO str[pos] := adr[pos]; INC(pos); 	END;
+		WHILE s[pos] # 0X DO str[pos] := s[pos]; INC(pos); END;
 
 	ELSE NEW(str, 1);
 	END;
-
 	str[pos] := 0X;
 	RETURN str;
-
 END GetStringFromAddr;
 
 (** wrapper procedure for getVersion() *)
@@ -1612,21 +1611,11 @@ BEGIN
 END SaveImage;
 
 (* called by FreeImage when error occurs *)
-#IF UNIX THEN
- PROCEDURE {C} MyOutputMessageFunction(fif: IMAGE_FORMAT;  msg: POINTER  {UNSAFE} TO ARRAY OF CHAR);
-#ELSE
- PROCEDURE {WINAPI} MyOutputMessageFunction(fif: IMAGE_FORMAT;  msg: POINTER  {UNSAFE} TO ARRAY OF CHAR);
-#END
-
-VAR 
-	i: SIGNED32;
+PROCEDURE {PlatformCC} MyOutputMessageFunction(fif: IMAGE_FORMAT; msg: POINTER {UNSAFE} TO ARRAY 1024 OF CHAR);
 BEGIN	
 	IF msg # NIL THEN
 		KernelLog.String("FreeImage ERROR: ");
-		i := 0;
-		(* limit msg length to 255 *)
-		WHILE (i < 255) & (msg[i] # 0X) DO  KernelLog.Char( msg[i] ); INC( i ); END;
-
+		KernelLog.String(msg^);
 		KernelLog.String(", FIF_FORMAT= "); KernelLog.Int(fif, 0);
 		KernelLog.Ln; 
 	END;