src/lib/CDRDocument.cpp | 2
src/lib/CDRDocumentStructure.h | 214 ++++++++++++++++++++---------------------
src/lib/CDRParser.cpp | 70 ++++++-------
src/lib/CMXDocument.cpp | 2
src/lib/CMXParser.cpp | 10 -
5 files changed, 149 insertions(+), 149 deletions(-)
New commits:
commit 6945e18f1ff703918e291de8ebc461769aad2783
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Sat Apr 27 15:36:50 2013 +0200
Avoid define clashes with some windows headers
diff --git a/src/lib/CDRDocument.cpp b/src/lib/CDRDocument.cpp
index a1ae8d2..497e27c 100644
--- a/src/lib/CDRDocument.cpp
+++ b/src/lib/CDRDocument.cpp
@@ -48,7 +48,7 @@ static unsigned getCDRVersion(WPXInputStream *input)
unsigned riff = readU32(input);
if ((riff & 0xffff) == 0x4c57) // "WL<micro>\0"
return 200;
- if (riff != FOURCC_RIFF)
+ if (riff != CDR_FOURCC_RIFF)
return 0;
input->seek(4, WPX_SEEK_CUR);
char signature_c = (char)readU8(input);
diff --git a/src/lib/CDRDocumentStructure.h b/src/lib/CDRDocumentStructure.h
index 21df716..70cc373 100644
--- a/src/lib/CDRDocumentStructure.h
+++ b/src/lib/CDRDocumentStructure.h
@@ -31,113 +31,113 @@
// integer representations of fourcc
-#define FOURCC_arrt 0x74727261
-#define FOURCC_arrw 0x77727261
-#define FOURCC_arrx 0x78727261
-
-#define FOURCC_bbox 0x786f6262
-#define FOURCC_bcfg 0x67666362
-#define FOURCC_bmkt 0x746b6d62
-#define FOURCC_bmp 0x20706d62
-#define FOURCC_bmpf 0x66706d62
-#define FOURCC_bmpt 0x74706d62
-#define FOURCC_bmpx 0x78706d62
-#define FOURCC_bmrk 0x6b726d62
-#define FOURCC_bpft 0x74667062
-
-#define FOURCC_CDR 0x524443
-#define FOURCC_ccmm 0x6d6d6363
-#define FOURCC_cdr 0x726463
-#define FOURCC_clo 0x206f6c63
-#define FOURCC_cloa 0x616f6c63
-#define FOURCC_clof 0x666f6c63
-#define FOURCC_clol 0x6c6f6c63
-#define FOURCC_cloo 0x6f6f6c63
-#define FOURCC_clpt 0x74706c63
-#define FOURCC_cmpr 0x72706d63
-#define FOURCC_cont 0x746e6f63
-#define FOURCC_CPng 0x676e5043
-
-#define FOURCC_digk 0x6b676964
-#define FOURCC_DISP 0x50534944
-#define FOURCC_doc 0x20636f64
-
-#define FOURCC_envd 0x64766e65
-
-#define FOURCC_filc 0x636c6966
-#define FOURCC_fild 0x646c6966
-#define FOURCC_fill 0x6c6c6966
-#define FOURCC_filt 0x746c6966
-#define FOURCC_flgs 0x73676c66
-#define FOURCC_fntt 0x74746e66
-#define FOURCC_font 0x746e6f66
-#define FOURCC_ftil 0x6c697466
-#define FOURCC_fver 0x72657666
-
-#define FOURCC_gobj 0x6a626f67
-#define FOURCC_grp 0x20707267
-#define FOURCC_guid 0x64697567
-
-#define FOURCC_iccd 0x64636369
-#define FOURCC_iccp 0x70636369
-#define FOURCC_ICMT 0x544d4349
-#define FOURCC_IKEY 0x59454b49
-#define FOURCC_INFO 0x4f464e49
-
-#define FOURCC_layr 0x7279616c
-#define FOURCC_lgob 0x626f676c
-#define FOURCC_LIST 0x5453494c
-#define FOURCC_lnkg 0x676b6e6c
-#define FOURCC_lnkt 0x746b6e6c
-#define FOURCC_loda 0x61646f6c
-#define FOURCC_lobj 0x6a626f6c
-
-#define FOURCC_mcfg 0x6766636d
-
-#define FOURCC_npps 0x7370706e
-
-#define FOURCC_obbx 0x7862626f
-#define FOURCC_obj 0x206a626f
-#define FOURCC_osfp 0x7066736f
-#define FOURCC_otlt 0x746c746f
-#define FOURCC_outl 0x6c74756f
-
-#define FOURCC_page 0x65676170
-#define FOURCC_pfrd 0x64726670
-#define FOURCC_ppdt 0x74647070
-#define FOURCC_ppid 0x64697070
-#define FOURCC_pref 0x66657270
-#define FOURCC_ptrt 0x74727470
-
-#define FOURCC_RIFF 0x46464952
-#define FOURCC_RIFX 0x58464952
-#define FOURCC_rvsn 0x6e737672
-
-#define FOURCC_spnd 0x646e7073
-#define FOURCC_stlt 0x746c7473
-#define FOURCC_styd 0x64797473
-#define FOURCC_styl 0x6c797473
-#define FOURCC_sumi 0x696d7573
-#define FOURCC_summ 0x6d6d7573
-
-#define FOURCC_trfd 0x64667274
-#define FOURCC_trfl 0x6c667274
-#define FOURCC_ttil 0x6c697474
-#define FOURCC_txsm 0x6d737874
-#define FOURCC_txtj 0x6a747874
-
-#define FOURCC_uidr 0x72646975
-#define FOURCC_uil 0x206c6975
-#define FOURCC_url 0x206c7275
-#define FOURCC_urll 0x6c6c7275
-#define FOURCC_urls 0x736c7275
-#define FOURCC_usdn 0x6e647375
-#define FOURCC_user 0x72657375
-#define FOURCC_usft 0x74667375
-
-#define FOURCC_vect 0x74636576
-#define FOURCC_vpat 0x74617076
-#define FOURCC_vrsn 0x6e737276
+#define CDR_FOURCC_arrt 0x74727261
+#define CDR_FOURCC_arrw 0x77727261
+#define CDR_FOURCC_arrx 0x78727261
+
+#define CDR_FOURCC_bbox 0x786f6262
+#define CDR_FOURCC_bcfg 0x67666362
+#define CDR_FOURCC_bmkt 0x746b6d62
+#define CDR_FOURCC_bmp 0x20706d62
+#define CDR_FOURCC_bmpf 0x66706d62
+#define CDR_FOURCC_bmpt 0x74706d62
+#define CDR_FOURCC_bmpx 0x78706d62
+#define CDR_FOURCC_bmrk 0x6b726d62
+#define CDR_FOURCC_bpft 0x74667062
+
+#define CDR_FOURCC_CDR 0x524443
+#define CDR_FOURCC_ccmm 0x6d6d6363
+#define CDR_FOURCC_cdr 0x726463
+#define CDR_FOURCC_clo 0x206f6c63
+#define CDR_FOURCC_cloa 0x616f6c63
+#define CDR_FOURCC_clof 0x666f6c63
+#define CDR_FOURCC_clol 0x6c6f6c63
+#define CDR_FOURCC_cloo 0x6f6f6c63
+#define CDR_FOURCC_clpt 0x74706c63
+#define CDR_FOURCC_cmpr 0x72706d63
+#define CDR_FOURCC_cont 0x746e6f63
+#define CDR_FOURCC_CPng 0x676e5043
+
+#define CDR_FOURCC_digk 0x6b676964
+#define CDR_FOURCC_DISP 0x50534944
+#define CDR_FOURCC_doc 0x20636f64
+
+#define CDR_FOURCC_envd 0x64766e65
+
+#define CDR_FOURCC_filc 0x636c6966
+#define CDR_FOURCC_fild 0x646c6966
+#define CDR_FOURCC_fill 0x6c6c6966
+#define CDR_FOURCC_filt 0x746c6966
+#define CDR_FOURCC_flgs 0x73676c66
+#define CDR_FOURCC_fntt 0x74746e66
+#define CDR_FOURCC_font 0x746e6f66
+#define CDR_FOURCC_ftil 0x6c697466
+#define CDR_FOURCC_fver 0x72657666
+
+#define CDR_FOURCC_gobj 0x6a626f67
+#define CDR_FOURCC_grp 0x20707267
+#define CDR_FOURCC_guid 0x64697567
+
+#define CDR_FOURCC_iccd 0x64636369
+#define CDR_FOURCC_iccp 0x70636369
+#define CDR_FOURCC_ICMT 0x544d4349
+#define CDR_FOURCC_IKEY 0x59454b49
+#define CDR_FOURCC_INFO 0x4f464e49
+
+#define CDR_FOURCC_layr 0x7279616c
+#define CDR_FOURCC_lgob 0x626f676c
+#define CDR_FOURCC_LIST 0x5453494c
+#define CDR_FOURCC_lnkg 0x676b6e6c
+#define CDR_FOURCC_lnkt 0x746b6e6c
+#define CDR_FOURCC_loda 0x61646f6c
+#define CDR_FOURCC_lobj 0x6a626f6c
+
+#define CDR_FOURCC_mcfg 0x6766636d
+
+#define CDR_FOURCC_npps 0x7370706e
+
+#define CDR_FOURCC_obbx 0x7862626f
+#define CDR_FOURCC_obj 0x206a626f
+#define CDR_FOURCC_osfp 0x7066736f
+#define CDR_FOURCC_otlt 0x746c746f
+#define CDR_FOURCC_outl 0x6c74756f
+
+#define CDR_FOURCC_page 0x65676170
+#define CDR_FOURCC_pfrd 0x64726670
+#define CDR_FOURCC_ppdt 0x74647070
+#define CDR_FOURCC_ppid 0x64697070
+#define CDR_FOURCC_pref 0x66657270
+#define CDR_FOURCC_ptrt 0x74727470
+
+#define CDR_FOURCC_RIFF 0x46464952
+#define CDR_FOURCC_RIFX 0x58464952
+#define CDR_FOURCC_rvsn 0x6e737672
+
+#define CDR_FOURCC_spnd 0x646e7073
+#define CDR_FOURCC_stlt 0x746c7473
+#define CDR_FOURCC_styd 0x64797473
+#define CDR_FOURCC_styl 0x6c797473
+#define CDR_FOURCC_sumi 0x696d7573
+#define CDR_FOURCC_summ 0x6d6d7573
+
+#define CDR_FOURCC_trfd 0x64667274
+#define CDR_FOURCC_trfl 0x6c667274
+#define CDR_FOURCC_ttil 0x6c697474
+#define CDR_FOURCC_txsm 0x6d737874
+#define CDR_FOURCC_txtj 0x6a747874
+
+#define CDR_FOURCC_uidr 0x72646975
+#define CDR_FOURCC_uil 0x206c6975
+#define CDR_FOURCC_url 0x206c7275
+#define CDR_FOURCC_urll 0x6c6c7275
+#define CDR_FOURCC_urls 0x736c7275
+#define CDR_FOURCC_usdn 0x6e647375
+#define CDR_FOURCC_user 0x72657375
+#define CDR_FOURCC_usft 0x74667375
+
+#define CDR_FOURCC_vect 0x74636576
+#define CDR_FOURCC_vpat 0x74617076
+#define CDR_FOURCC_vrsn 0x6e737276
// Types of Styd arguments
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 4123340..1dfcec5 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -619,38 +619,38 @@ bool libcdr::CDRParser::parseRecord(WPXInputStream
*input, unsigned *blockLength
length=blockLengths[length];
unsigned long position = input->tell();
unsigned listType(0);
- if (fourCC == FOURCC_RIFF || fourCC == FOURCC_LIST)
+ if (fourCC == CDR_FOURCC_RIFF || fourCC == CDR_FOURCC_LIST)
{
listType = readU32(input);
- if (listType == FOURCC_stlt && m_version >= 700)
+ if (listType == CDR_FOURCC_stlt && m_version >= 700)
fourCC = listType;
else
m_collector->collectOtherList();
}
CDR_DEBUG_MSG(("Record: level %u %s, length: 0x%.8x (%u)\n", level,
toFourCC(fourCC), length, length));
- if (fourCC == FOURCC_RIFF || fourCC == FOURCC_LIST)
+ if (fourCC == CDR_FOURCC_RIFF || fourCC == CDR_FOURCC_LIST)
{
CDR_DEBUG_MSG(("CDR listType: %s\n", toFourCC(listType)));
unsigned cmprsize = length-4;
- if (listType == FOURCC_cmpr)
+ if (listType == CDR_FOURCC_cmpr)
{
cmprsize = readU32(input);
input->seek(12, WPX_SEEK_CUR);
- if (readU32(input) != FOURCC_CPng)
+ if (readU32(input) != CDR_FOURCC_CPng)
return false;
if (readU16(input) != 1)
return false;
if (readU16(input) != 4)
return false;
}
- else if (listType == FOURCC_page)
+ else if (listType == CDR_FOURCC_page)
m_collector->collectPage(level);
- else if (listType == FOURCC_obj)
+ else if (listType == CDR_FOURCC_obj)
m_collector->collectObject(level);
- else if (listType == FOURCC_grp || listType == FOURCC_lnkg)
+ else if (listType == CDR_FOURCC_grp || listType == CDR_FOURCC_lnkg)
m_collector->collectGroup(level);
- else if ((listType & 0xffffff) == FOURCC_CDR || (listType & 0xffffff) ==
FOURCC_cdr)
+ else if ((listType & 0xffffff) == CDR_FOURCC_CDR || (listType &
0xffffff) == CDR_FOURCC_cdr)
{
m_version = getCDRVersion((listType & 0xff000000) >> 24);
if (m_version < 600)
@@ -658,10 +658,10 @@ bool libcdr::CDRParser::parseRecord(WPXInputStream
*input, unsigned *blockLength
else
m_precision = libcdr::PRECISION_32BIT;
}
- else if (listType == FOURCC_vect || listType == FOURCC_clpt)
+ else if (listType == CDR_FOURCC_vect || listType == CDR_FOURCC_clpt)
m_collector->collectVect(level);
- bool compressed = (listType == FOURCC_cmpr ? true : false);
+ bool compressed = (listType == CDR_FOURCC_cmpr ? true : false);
CDRInternalStream tmpStream(input, cmprsize, compressed);
if (!compressed)
{
@@ -696,71 +696,71 @@ void libcdr::CDRParser::readRecord(unsigned fourCC,
unsigned length, WPXInputStr
long recordStart = input->tell();
switch (fourCC)
{
- case FOURCC_DISP:
+ case CDR_FOURCC_DISP:
readDisp(input, length);
break;
- case FOURCC_loda:
- case FOURCC_lobj:
+ case CDR_FOURCC_loda:
+ case CDR_FOURCC_lobj:
readLoda(input, length);
break;
- case FOURCC_vrsn:
+ case CDR_FOURCC_vrsn:
readVersion(input, length);
break;
- case FOURCC_trfd:
+ case CDR_FOURCC_trfd:
readTrfd(input, length);
break;
- case FOURCC_outl:
+ case CDR_FOURCC_outl:
readOutl(input, length);
break;
- case FOURCC_fild:
- case FOURCC_fill:
+ case CDR_FOURCC_fild:
+ case CDR_FOURCC_fill:
readFild(input, length);
break;
- case FOURCC_arrw:
+ case CDR_FOURCC_arrw:
break;
- case FOURCC_flgs:
+ case CDR_FOURCC_flgs:
readFlags(input, length);
break;
- case FOURCC_mcfg:
+ case CDR_FOURCC_mcfg:
readMcfg(input, length);
break;
- case FOURCC_bmp:
+ case CDR_FOURCC_bmp:
readBmp(input, length);
break;
- case FOURCC_bmpf:
+ case CDR_FOURCC_bmpf:
readBmpf(input, length);
break;
- case FOURCC_ppdt:
+ case CDR_FOURCC_ppdt:
readPpdt(input, length);
break;
- case FOURCC_ftil:
+ case CDR_FOURCC_ftil:
readFtil(input, length);
break;
- case FOURCC_iccd:
+ case CDR_FOURCC_iccd:
readIccd(input, length);
break;
- case FOURCC_bbox:
+ case CDR_FOURCC_bbox:
readBBox(input, length);
break;
- case FOURCC_spnd:
+ case CDR_FOURCC_spnd:
readSpnd(input, length);
break;
- case FOURCC_uidr:
+ case CDR_FOURCC_uidr:
readUidr(input, length);
break;
- case FOURCC_vpat:
+ case CDR_FOURCC_vpat:
readVpat(input, length);
break;
- case FOURCC_font:
+ case CDR_FOURCC_font:
readFont(input, length);
break;
- case FOURCC_stlt:
+ case CDR_FOURCC_stlt:
readStlt(input, length);
break;
- case FOURCC_txsm:
+ case CDR_FOURCC_txsm:
readTxsm(input, length);
break;
- case FOURCC_styd:
+ case CDR_FOURCC_styd:
readStyd(input);
break;
default:
diff --git a/src/lib/CMXDocument.cpp b/src/lib/CMXDocument.cpp
index 9845552..b6becce 100644
--- a/src/lib/CMXDocument.cpp
+++ b/src/lib/CMXDocument.cpp
@@ -49,7 +49,7 @@ try
{
input->seek(0, WPX_SEEK_SET);
unsigned riff = readU32(input);
- if (riff != FOURCC_RIFF && riff != FOURCC_RIFX)
+ if (riff != CDR_FOURCC_RIFF && riff != CDR_FOURCC_RIFX)
return false;
input->seek(4, WPX_SEEK_CUR);
char signature_c = (char)readU8(input);
diff --git a/src/lib/CMXParser.cpp b/src/lib/CMXParser.cpp
index 0f6b17a..59afc07 100644
--- a/src/lib/CMXParser.cpp
+++ b/src/lib/CMXParser.cpp
@@ -99,7 +99,7 @@ bool libcdr::CMXParser::parseRecord(WPXInputStream *input,
unsigned level)
CDR_DEBUG_MSG(("Record: level %u %s, length: 0x%.8x (%u)\n", level,
toFourCC(fourCC), length, length));
- if (fourCC == FOURCC_RIFF || fourCC == FOURCC_RIFX || fourCC ==
FOURCC_LIST)
+ if (fourCC == CDR_FOURCC_RIFF || fourCC == CDR_FOURCC_RIFX || fourCC ==
CDR_FOURCC_LIST)
{
#ifdef DEBUG
unsigned listType = readU32(input);
@@ -129,16 +129,16 @@ void libcdr::CMXParser::readRecord(unsigned fourCC,
unsigned &length, WPXInputSt
long recordEnd = input->tell() + length;
switch (fourCC)
{
- case FOURCC_cont:
+ case CDR_FOURCC_cont:
readCMXHeader(input);
break;
- case FOURCC_DISP:
+ case CDR_FOURCC_DISP:
readDisp(input, length);
break;
- case FOURCC_page:
+ case CDR_FOURCC_page:
readPage(input, length);
break;
- case FOURCC_ccmm:
+ case CDR_FOURCC_ccmm:
readCcmm(input, recordEnd);
break;
default:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
