Attachment #65967 for issue #106523

View | Details | Raw Unified | Return to issue 106523
Collapse All | Expand All

Lines 31-41 Link Here

(-)a/icc/README (-5 / +3 lines)
31		31
32	<build>/misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h	32	<build>/misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h
33		33
34	The patches:	34	The patchs:
35	SampleICC-1.3.2.patch is the file to be used for Linux and Windows	35	SampleICC-1.3.2.patch tweaks the build to use the endianness
36	SampleICC-1.3.2-bendian.patch is the file to be used for	36	detected in sal.
37	big endian platform, formed from the above patch plus the big endian
38	forcing.
39		37
40	beppec56@openoffice.org	38	beppec56@openoffice.org
41		39

Lines 1-5 Link Here

(-)a/icc/SampleICC-1.3.2.patch
1	*** misc/SampleICC-1.3.2/configure Mon Aug 20 22:10:59 2007	1	*** misc/SampleICC-1.3.2/configure Mon Aug 20 22:10:59 2007

Lines 60-66 Link Here

(-)- misc/build/SampleICC-1.3.2/configure
60	*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5	60	*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
61	echo "$as_me: error: invalid argument: $ac_config_target" >&2;}	61	echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
62	*** misc/SampleICC-1.3.2/Contrib/Makefile.in Mon Aug 20 22:10:37 2007	62	*** misc/SampleICC-1.3.2/Contrib/Makefile.in Mon Aug 20 22:10:37 2007

Lines 95-101 Link Here

(-)- misc/build/SampleICC-1.3.2/Contrib/Makefile.in
95	subdir = Contrib	95	subdir = Contrib
96	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs	96	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
97	*** misc/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in Mon Aug 20 22:10:34 2007	97	*** misc/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in Mon Aug 20 22:10:34 2007

Lines 126-132 Link Here

(-)- misc/build/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in
126	subdir = Contrib/CmdLine	126	subdir = Contrib/CmdLine
127	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs	127	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
128	*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in Mon Aug 20 22:10:35 2007	128	*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in Mon Aug 20 22:10:35 2007

Lines 145-151 Link Here

(-)- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in
145	ICC_tool_exception.lo Vetters.lo	145	ICC_tool_exception.lo Vetters.lo
146	libICC_utils_la_OBJECTS = $(am_libICC_utils_la_OBJECTS)	146	libICC_utils_la_OBJECTS = $(am_libICC_utils_la_OBJECTS)
147	*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h Mon Aug 20 22:04:53 2007	147	*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h Mon Aug 20 22:04:53 2007

Lines 164-170 Link Here

(-)- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h
164	return (r_ != p.r_) ? (r_ < p.r_) : ((g_ != p.g_) ? (g_ < p.g_) : (b_ < p.b_));	164	return (r_ != p.r_) ? (r_ < p.r_) : ((g_ != p.g_) ? (g_ < p.g_) : (b_ < p.b_));
165	}	165	}
166	*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp Mon Aug 20 22:04:54 2007	166	*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp Mon Aug 20 22:04:54 2007

Lines 820-826 Link Here

(-)- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp
820	! }	820	! }
821	! }	821	! }
822	*** misc/SampleICC-1.3.2/IccProfLib/IccIO.cpp Mon Aug 20 22:05:00 2007	822	*** misc/SampleICC-1.3.2/IccProfLib/IccIO.cpp Mon Aug 20 22:05:00 2007




  #include <string.h>
  
  #ifndef __max
*** misc/SampleICC-1.3.2/IccProfLib/IccIO.h	Mon Aug 20 22:05:00 2007
--- misc/build/SampleICC-1.3.2/IccProfLib/IccIO.h	Fri Jan 25 14:23:09 2008
***************
*** 79,84 ****
--- 79,85 ----
  #define _ICCIO_H
  
  #include "IccDefs.h"
+ #include "memory"
  #include "stdio.h"
  
  #ifdef USESAMPLEICCNAMESPACE
*** misc/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp	Mon Aug 20 22:05:00 2007

Lines 878-884 Link Here

(-)- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp
878	icMemDump(sDescription, m_pData, m_nDataSize);	890	icMemDump(sDescription, m_pData, m_nDataSize);
879	}	891	}
880	*** misc/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp Mon Aug 20 22:05:00 2007	892	*** misc/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp Mon Aug 20 22:05:00 2007




      return icValidateCriticalError;
    }
  
*** misc/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h	Mon Aug 20 22:05:00 2007
--- misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h	Fri Jan 25 14:23:09 2008
***************
*** 107,126 ****
  
  #else // non-PC, perhaps Mac or Linux
  
!   #define ICCUINT64 unsigned long long
!   #define ICCINT64  long long
!   #define ICUINT64TYPE unsigned long long
!   #define ICINT64TYPE long long
! 
!   #if defined(__APPLE__)
!     #if  defined(__LITTLE_ENDIAN__)
!       #define ICC_BYTE_ORDER_LITTLE_ENDIAN
!     #else
!       #define ICC_BYTE_ORDER_BIG_ENDIAN
!     #endif
!   #else
!     #define ICC_BYTE_ORDER_LITTLE_ENDIAN
!   #endif
  
    #define ICCPROFLIB_API
    #define ICCPROFLIB_EXTERN
--- 107,129 ----
  
  #else // non-PC, perhaps Mac or Linux
  
! #include <sal/types.h>
! #include <osl/endian.h>
! 
!   #define ICCUINT64 sal_uInt64
!   #define ICCINT64 sal_Int64
!   #define ICUINT64TYPE sal_uInt64
!   #define ICINT64TYPE sal_Int64
!   #define ICINT32TYPE sal_Int32
!   #define ICUINT32TYPE sal_uInt32
! 
! #if defined(_LITTLE_ENDIAN)
! #    define ICC_BYTE_ORDER_LITTLE_ENDIAN
! #elif defined(_BIG_ENDIAN)
! #    define ICC_BYTE_ORDER_BIG_ENDIAN
! #else
! #    error "ENDIAN unknown"
! #endif
  
    #define ICCPROFLIB_API
    #define ICCPROFLIB_EXTERN
*** misc/SampleICC-1.3.2/IccProfLib/IccProfile.cpp	Mon Aug 20 22:05:00 2007

Lines 1989-1995 Link Here

(-)- misc/build/SampleICC-1.3.2/IccProfLib/IccProfile.cpp
1989	return NULL;	2049	return NULL;
1990	}	2050	}
1991	*** misc/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp Mon Aug 20 22:05:00 2007	2051	*** misc/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp Mon Aug 20 22:05:00 2007

Lines 3311-3317 Link Here

(-)- misc/build/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp
3311	}	3371	}
3312	else {	3372	else {
3313	*** misc/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp Mon Aug 20 22:05:00 2007	3373	*** misc/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp Mon Aug 20 22:05:00 2007

Lines 4443-4449 Link Here

(-)- misc/build/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp
4443	}	4503	}
4444	}	4504	}
4445	*** misc/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp Mon Aug 20 22:05:00 2007	4505	*** misc/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp Mon Aug 20 22:05:00 2007

Lines 4615-4621 Link Here

(-)- misc/build/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp
4615	}	4675	}
4616		4676
4617	*** misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp Mon Aug 20 22:05:00 2007	4677	*** misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp Mon Aug 20 22:05:00 2007

Lines 4706-4712 Link Here

(-)- misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp
4706		4766
4707		4767
4708	*** misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h Mon Aug 20 22:05:00 2007	4768	*** misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h Mon Aug 20 22:05:00 2007

Lines 4719-4725 Link Here

(-)- misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h
4719		4779
4720	! #endif //_ICCTAGPROFSEQID_H	4780	! #endif //_ICCTAGPROFSEQID_H
4721	*** misc/SampleICC-1.3.2/IccProfLib/IccUtil.cpp Mon Aug 20 22:05:00 2007	4781	*** misc/SampleICC-1.3.2/IccProfLib/IccUtil.cpp Mon Aug 20 22:05:00 2007

Lines 4974-4980 Link Here

(-)- misc/build/SampleICC-1.3.2/IccProfLib/IccUtil.cpp
4974	rv = icMaxStatus(rv, icValidateWarning);	5034	rv = icMaxStatus(rv, icValidateWarning);
4975	}	5035	}
4976	*** misc/SampleICC-1.3.2/IccProfLib/icProfileHeader.h Mon Aug 20 22:05:00 2007	5036	*** misc/SampleICC-1.3.2/IccProfLib/icProfileHeader.h Mon Aug 20 22:05:00 2007

Lines 5000-5006 Link Here

(-)- misc/build/SampleICC-1.3.2/IccProfLib/icProfileHeader.h
5000		5060
5001		5061
5002	*** misc/SampleICC-1.3.2/Tools/CmdLine/Makefile.in Mon Aug 20 22:10:42 2007	5062	*** misc/SampleICC-1.3.2/Tools/CmdLine/Makefile.in Mon Aug 20 22:10:42 2007




# --- Files --------------------------------------------------------

TARFILE_NAME=SampleICC-1.3.2
#checking for endianess
.IF "$(CPU)"=="I"
PATCH_FILES=$(TARFILE_NAME).patch
.ELSE
PATCH_FILES=$(TARFILE_NAME)-bendian.patch
.ENDIF

CONVERTFILES= \
	IccProfLib$/IccTagProfSeqId.h \

Lines 1-3 Link Here

(-)a/icc/prj/build.lst (-1 / +1 lines)
1	ip icc : solenv external NULL	1	ip icc : solenv external sal NULL
2	ip icc usr1 - all ip_mkout NULL	2	ip icc usr1 - all ip_mkout NULL
3	ip icc nmake - all ip_icc NULL	3	ip icc nmake - all ip_icc NULL

Return to issue 106523

Lines 838-845 Link Here

(-)- misc/build/SampleICC-1.3.2/IccProfLib/IccIO.cpp (+12 lines)
838	#include <string.h>	838	#include <string.h>
839		839
840	#ifndef __max	840	#ifndef __max
		841	*** misc/SampleICC-1.3.2/IccProfLib/IccIO.h Mon Aug 20 22:05:00 2007
		842	--- misc/build/SampleICC-1.3.2/IccProfLib/IccIO.h Fri Jan 25 14:23:09 2008
		843	***************
		844	* 79,84 **
		845	--- 79,85 ----
		846	#define _ICCIO_H
		847
		848	#include "IccDefs.h"
		849	+ #include "memory"
		850	#include "stdio.h"
		851
		852	#ifdef USESAMPLEICCNAMESPACE
841	*** misc/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp Mon Aug 20 22:05:00 2007	853	*** misc/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp Mon Aug 20 22:05:00 2007

Lines 1362-1369 Link Here

(-)- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp (+48 lines)
1362	return icValidateCriticalError;	1374	return icValidateCriticalError;
1363	}	1375	}
1364		1376
		1377	*** misc/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h Mon Aug 20 22:05:00 2007
		1378	--- misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h Fri Jan 25 14:23:09 2008
		1379	***************
		1380	* 107,126 **
		1381
		1382	#else // non-PC, perhaps Mac or Linux
		1383
		1384	! #define ICCUINT64 unsigned long long
		1385	! #define ICCINT64 long long
		1386	! #define ICUINT64TYPE unsigned long long
		1387	! #define ICINT64TYPE long long
		1388	!
		1389	! #if defined(__APPLE__)
		1390	! #if defined(__LITTLE_ENDIAN__)
		1391	! #define ICC_BYTE_ORDER_LITTLE_ENDIAN
		1392	! #else
		1393	! #define ICC_BYTE_ORDER_BIG_ENDIAN
		1394	! #endif
		1395	! #else
		1396	! #define ICC_BYTE_ORDER_LITTLE_ENDIAN
		1397	! #endif
		1398
		1399	#define ICCPROFLIB_API
		1400	#define ICCPROFLIB_EXTERN
		1401	--- 107,129 ----
		1402
		1403	#else // non-PC, perhaps Mac or Linux
		1404
		1405	! #include <sal/types.h>
		1406	! #include <osl/endian.h>
		1407	!
		1408	! #define ICCUINT64 sal_uInt64
		1409	! #define ICCINT64 sal_Int64
		1410	! #define ICUINT64TYPE sal_uInt64
		1411	! #define ICINT64TYPE sal_Int64
		1412	! #define ICINT32TYPE sal_Int32
		1413	! #define ICUINT32TYPE sal_uInt32
		1414	!
		1415	! #if defined(_LITTLE_ENDIAN)
		1416	! # define ICC_BYTE_ORDER_LITTLE_ENDIAN
		1417	! #elif defined(_BIG_ENDIAN)
		1418	! # define ICC_BYTE_ORDER_BIG_ENDIAN
		1419	! #else
		1420	! # error "ENDIAN unknown"
		1421	! #endif
		1422
		1423	#define ICCPROFLIB_API
		1424	#define ICCPROFLIB_EXTERN
1365	*** misc/SampleICC-1.3.2/IccProfLib/IccProfile.cpp Mon Aug 20 22:05:00 2007	1425	*** misc/SampleICC-1.3.2/IccProfLib/IccProfile.cpp Mon Aug 20 22:05:00 2007

Lines 41-52 Link Here

(-)a/icc/makefile.mk (-5 lines)
41	# --- Files --------------------------------------------------------	41	# --- Files --------------------------------------------------------
42		42
43	TARFILE_NAME=SampleICC-1.3.2	43	TARFILE_NAME=SampleICC-1.3.2
44	#checking for endianess
45	.IF "$(CPU)"=="I"
46	PATCH_FILES=$(TARFILE_NAME).patch	44	PATCH_FILES=$(TARFILE_NAME).patch
47	.ELSE
48	PATCH_FILES=$(TARFILE_NAME)-bendian.patch
49	.ENDIF
50		45
51	CONVERTFILES= \	46	CONVERTFILES= \
52	IccProfLib$/IccTagProfSeqId.h \	47	IccProfLib$/IccTagProfSeqId.h \