Index: inc/grfmgr.hxx =================================================================== RCS file: /cvs/graphics/goodies/inc/grfmgr.hxx,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -u -r1.19 -r1.19.2.1 --- inc/grfmgr.hxx 9 Feb 2006 13:39:22 -0000 1.19 +++ inc/grfmgr.hxx 21 Feb 2006 12:06:34 -0000 1.19.2.1 @@ -108,7 +108,7 @@ long mnDummy1; long mnDummy2; double mfGamma; - ULONG mnMirrFlags; + sal_uInt32 mnMirrFlags; long mnLeftCrop; long mnTopCrop; long mnRightCrop; Index: source/filter.vcl/eos2met/eos2met.cxx =================================================================== RCS file: /cvs/graphics/goodies/source/filter.vcl/eos2met/eos2met.cxx,v retrieving revision 1.14 retrieving revision 1.14.20.1 diff -u -r1.14 -r1.14.20.1 --- source/filter.vcl/eos2met/eos2met.cxx 19 Jan 2006 18:44:40 -0000 1.14 +++ source/filter.vcl/eos2met/eos2met.cxx 21 Feb 2006 12:06:34 -0000 1.14.20.1 @@ -213,10 +213,10 @@ void METBitBlt(Point aPt, Size aSize, const Bitmap & rBitmap); void METBeginArea(BOOL bBoundaryLine); void METEndArea(); - void METBeginPath(ULONG nPathId); + void METBeginPath(sal_uInt32 nPathId); void METEndPath(); - void METFillPath(ULONG nPathId); - void METOutlinePath(ULONG nPathId); + void METFillPath(sal_uInt32 nPathId); + void METOutlinePath(sal_uInt32 nPathId); void METCloseFigure(); void METMove(Point aPt); void METLine(Point aPt1, Point aPt2); @@ -224,7 +224,7 @@ void METLine(const PolyPolygon & rPolyPolygon); void METLineAtCurPos(Point aPt); void METBox(BOOL bFill, BOOL bBoundary, - Rectangle aRect, ULONG nHAxis, ULONG nVAxis); + Rectangle aRect, sal_uInt32 nHAxis, sal_uInt32 nVAxis); void METArc(Point aP0, Point aP1, Point aP2); void METArcAtCurPos(Point aP1, Point aP2); void METFullArc(Point aCenter, double fMultiplier); @@ -555,7 +555,8 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap) { SvMemoryStream aTemp(0x00010000,0x00010000); - ULONG nWidth,nHeight,nResX,nResY,nBytesPerLine,i,j,nNumColors,ny,nLines; + sal_uInt32 nWidth,nHeight,nResX,nResY; + ULONG nBytesPerLine,i,j,nNumColors,ny,nLines; ULONG nActColMapId; USHORT nBitsPerPixel; BYTE nbyte, * pBuf; @@ -863,12 +864,12 @@ Size aUnitsPerDecimeter=OutputDevice::LogicToLogic(Size(10,10),MapMode(MAP_CM),aPictureMapMode); *pMET << (BYTE)0xf6 << (BYTE)0x28 << (BYTE)0x40 << (BYTE)0x00 << (BYTE)0x05 << (BYTE)0x01 - << (ULONG)(aUnitsPerDecimeter.Width()) - << (ULONG)(aUnitsPerDecimeter.Height()) - << (ULONG)0 - << (ULONG)0 << (ULONG)aPictureRect.GetWidth() - << (ULONG)0 << (ULONG)aPictureRect.GetHeight() - << (ULONG)0 << (ULONG)0; + << (sal_uInt32)(aUnitsPerDecimeter.Width()) + << (sal_uInt32)(aUnitsPerDecimeter.Height()) + << (sal_uInt32)0 + << (sal_uInt32)0 << (sal_uInt32)aPictureRect.GetWidth() + << (sal_uInt32)0 << (sal_uInt32)aPictureRect.GetHeight() + << (sal_uInt32)0 << (sal_uInt32)0; // 0 0x21 Set Current Defaults // 1 Length of following data @@ -895,8 +896,8 @@ // 6-n M11, M12, M21, M22, M41, M42 Matrix elements *pMET << (BYTE)0x21 << (BYTE)0x1c << (BYTE)0x07 << (BYTE)0xcc << (BYTE)0x0c << (BYTE)0x8f - << (ULONG)0x00010000 << (ULONG)0x00000000 << (ULONG)0x00000000 - << (ULONG)0x00010000 << (ULONG)0x00000000 << (ULONG)0x00000000; + << (sal_uInt32)0x00010000 << (sal_uInt32)0x00000000 << (sal_uInt32)0x00000000 + << (sal_uInt32)0x00010000 << (sal_uInt32)0x00000000 << (sal_uInt32)0x00000000; // 0 0x21 Set Current Defaults // 1 Length of following data @@ -1148,9 +1149,9 @@ *pMET << (BYTE)0x02 << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x00; WritePoint(Point(aPt.X(),aPt.Y()+aSize.Height())); WritePoint(Point(aPt.X()+aSize.Width(),aPt.Y())); - *pMET << (ULONG)0 << (ULONG)0 - << (ULONG)(rBitmap.GetSizePixel().Width()) - << (ULONG)(rBitmap.GetSizePixel().Height()); + *pMET << (sal_uInt32)0 << (sal_uInt32)0 + << (sal_uInt32)(rBitmap.GetSizePixel().Width()) + << (sal_uInt32)(rBitmap.GetSizePixel().Height()); } void METWriter::METSetAndPushLineInfo( const LineInfo& rLineInfo ) @@ -1228,7 +1229,7 @@ } -void METWriter::METBeginPath(ULONG nPathId) +void METWriter::METBeginPath(sal_uInt32 nPathId) { WillWriteOrder(8); *pMET << (BYTE)0xd0 << (BYTE)6 << (USHORT) 0 << nPathId; @@ -1242,7 +1243,7 @@ } -void METWriter::METFillPath(ULONG nPathId) +void METWriter::METFillPath(sal_uInt32 nPathId) { WillWriteOrder(8); *pMET << (BYTE)0xd7 << (BYTE)6 @@ -1250,7 +1251,7 @@ } -void METWriter::METOutlinePath(ULONG nPathId) +void METWriter::METOutlinePath(sal_uInt32 nPathId) { WillWriteOrder(8); *pMET << (BYTE)0xd4 << (BYTE)6 @@ -1325,7 +1326,7 @@ void METWriter::METBox(BOOL bFill, BOOL bBoundary, - Rectangle aRect, ULONG nHAxis, ULONG nVAxis) + Rectangle aRect, sal_uInt32 nHAxis, sal_uInt32 nVAxis) { BYTE nFlags=0; if (bFill) nFlags|=0x40; @@ -2411,7 +2412,7 @@ *pMET << (BYTE)0x0c << (BYTE)0x02 << (BYTE)0x84 << (BYTE)0x00; WriteFieldId(nId); *pMET << (BYTE)0x07 << (BYTE)0x22 << (BYTE)0x10; - *pMET << (ULONG)nId; + *pMET << (sal_uInt32)nId; nId++; } @@ -2449,10 +2450,10 @@ nNumberOfDataFields++; // Nun schreiben wir zunaechst den Kopf des Segments: - *pMET << (BYTE)0x70 << (BYTE)0x0e << (ULONG)0; + *pMET << (BYTE)0x70 << (BYTE)0x0e << (sal_uInt32)0; *pMET << (BYTE)0x70 << (BYTE)0x10; // Flags *pMET << (USHORT)0; // Lo-Wort der Laenge der Segementdaten (Big Endian) - *pMET << (ULONG)0; // Reserved + *pMET << (sal_uInt32)0; // Reserved *pMET << (USHORT)0; // Hi-Wort der Laenge der Segementdaten (Big Endian) (Ohh Ohh OS2) // Anmerkung: die richtige Daten-Laenge schreiben wir weiter unten nochmal Index: source/filter.vcl/epict/epict.cxx =================================================================== RCS file: /cvs/graphics/goodies/source/filter.vcl/epict/epict.cxx,v retrieving revision 1.14 retrieving revision 1.14.52.1 diff -u -r1.14 -r1.14.52.1 --- source/filter.vcl/epict/epict.cxx 5 Oct 2005 13:06:32 -0000 1.14 +++ source/filter.vcl/epict/epict.cxx 21 Feb 2006 12:06:34 -0000 1.14.52.1 @@ -82,7 +82,7 @@ struct PictPattern { - ULONG nLo, nHi; + sal_uInt32 nLo, nHi; }; @@ -967,7 +967,7 @@ nDstRowBytes = nWidth * 4; // Opcode und BaseAddr (?) schreiben: - *pPict << (USHORT)0x009a << (ULONG)0x000000ff; + *pPict << (USHORT)0x009a << (sal_uInt32)0x000000ff; // Normalerweise wollen wir den Packing-Type 4 (Run length encoding // for 32-Bit Pixels) erzeugen. Wenn aber RowBytes<8 gilt, sind die Daten @@ -988,16 +988,16 @@ << (USHORT)nWidth // X2-Position der Bitmap in der Quelle << (USHORT)0x0000 // Version << (USHORT)nPackType // Packing type - << (ULONG) 0x00000000 // Packing size (?) - << (ULONG) 0x00480000 // H-Res - << (ULONG) 0x00480000 // V-Res + << (sal_uInt32) 0x00000000 // Packing size (?) + << (sal_uInt32) 0x00480000 // H-Res + << (sal_uInt32) 0x00480000 // V-Res << (USHORT)0x0010 // Pixel type (?) << (USHORT)0x0020 // Pixel size: 32 bit << (USHORT)0x0004 // CmpCount: 4 Komponenten << (USHORT)0x0008 // CmpSize: 8 Bits - << (ULONG) 0x00000000 // PlaneBytes (?) - << (ULONG) 0x00000000 // (?) - << (ULONG) 0x00000000; // (?) + << (sal_uInt32) 0x00000000 // PlaneBytes (?) + << (sal_uInt32) 0x00000000 // (?) + << (sal_uInt32) 0x00000000; // (?) // Source-Rectangle schreiben: *pPict << (USHORT)0x0000 // Y1-Position auf der Bitmap @@ -1174,20 +1174,20 @@ << (USHORT)nWidth // X2-Position der Bitmap in der Quelle << (USHORT)0x0000 // Version << (USHORT)nPackType // Packing type - << (ULONG) 0x00000000 // Packing size (?) - << (ULONG) 0x00480000 // H-Res - << (ULONG) 0x00480000 // V-Res + << (sal_uInt32) 0x00000000 // Packing size (?) + << (sal_uInt32) 0x00480000 // H-Res + << (sal_uInt32) 0x00480000 // V-Res << (USHORT)0x0000 // Pixel type (?) << (USHORT)nBitsPerPixel // Pixel size << (USHORT)0x0001 // CmpCount: 1 Komponente << (USHORT)nBitsPerPixel // CmpSize - << (ULONG) 0x00000000 // PlaneBytes (?) - << (ULONG) 0x00000000 // (?) - << (ULONG) 0x00000000; // (?) + << (sal_uInt32) 0x00000000 // PlaneBytes (?) + << (sal_uInt32) 0x00000000 // (?) + << (sal_uInt32) 0x00000000; // (?) // Palette lesen und schreiben: nColTabSize = pAcc->GetPaletteEntryCount(); - *pPict << (ULONG)0 << (USHORT)0x8000 << (USHORT)( nColTabSize - 1 ); + *pPict << (sal_uInt32)0 << (USHORT)0x8000 << (USHORT)( nColTabSize - 1 ); for ( i = 0; i < nColTabSize; i++ ) { @@ -2129,7 +2129,7 @@ Rectangle aRect( aPoint, aSize ); // 512 Bytes "Muell" am Anfang: - for (i=0;i<128;i++) *pPict << (ULONG)0; + for (i=0;i<128;i++) *pPict << (sal_uInt32)0; // Lo-16-Bits der Groesse der Datei ohne die 512 Bytes Muell: *pPict << (USHORT)0; // wird spaeter durch UpdateHeader() berichtigt @@ -2138,16 +2138,16 @@ WriteRectangle( aRect ); // Version 2: - *pPict << (ULONG)0x001102ff; + *pPict << (sal_uInt32)0x001102ff; // Extended-Version-2-Header: *pPict << (USHORT)0x0c00 // Opcode << (USHORT)0xfffe // Version (?) << (USHORT)0x0000 // Reserved - << (ULONG) 0x00480000 // hRes - << (ULONG) 0x00480000; + << (sal_uInt32) 0x00480000 // hRes + << (sal_uInt32) 0x00480000; WriteRectangle( aRect ); - *pPict << (ULONG)0x00000000; // Reserved + *pPict << (sal_uInt32)0x00000000; // Reserved // viele Import-Filter verlangen die Angabe eines // Clipping-Bereichs am Anfang Index: source/filter.vcl/eras/eras.cxx =================================================================== RCS file: /cvs/graphics/goodies/source/filter.vcl/eras/eras.cxx,v retrieving revision 1.4 retrieving revision 1.4.62.1 diff -u -r1.4 -r1.4.62.1 --- source/filter.vcl/eras/eras.cxx 9 Sep 2005 02:46:00 -0000 1.4 +++ source/filter.vcl/eras/eras.cxx 21 Feb 2006 12:06:35 -0000 1.4.62.1 @@ -159,7 +159,7 @@ { *mpOStm << (UINT32)0x59a66a95 << (UINT32)mnWidth << (UINT32)mnHeight << (UINT32)mnDepth - << (UINT32) ( ( ( ( mnWidth * mnDepth ) + 15 ) >> 4 ) << 1 ) * mnHeight + << (UINT32)(( ( ( ( mnWidth * mnDepth ) + 15 ) >> 4 ) << 1 ) * mnHeight) << (UINT32)2; if ( mnDepth > 8 ) Index: source/filter.vcl/etiff/etiff.cxx =================================================================== RCS file: /cvs/graphics/goodies/source/filter.vcl/etiff/etiff.cxx,v retrieving revision 1.4 retrieving revision 1.4.62.1 diff -u -r1.4 -r1.4.62.1 --- source/filter.vcl/etiff/etiff.cxx 9 Sep 2005 02:46:28 -0000 1.4 +++ source/filter.vcl/etiff/etiff.cxx 21 Feb 2006 12:06:35 -0000 1.4.62.1 @@ -115,7 +115,7 @@ void ImplWritePalette(); BOOL ImplWriteBody(); void ImplWriteTag( UINT16 TagID, UINT16 DataType, UINT32 NumberOfItems, UINT32 Value); - void ImplWriteResolution( ULONG nStreamPos, ULONG nResolutionUnit ); + void ImplWriteResolution( ULONG nStreamPos, sal_uInt32 nResolutionUnit ); void StartCompression(); void Compress( BYTE nSrc ); void EndCompression(); @@ -332,7 +332,7 @@ USHORT i; ULONG nCurrentPos = mpOStm->Tell(); mpOStm->Seek( mnPalPos + 8 ); // the palette tag entry needs the offset - *mpOStm << nCurrentPos - mnStreamOfs; // to the palette colors + *mpOStm << static_cast(nCurrentPos - mnStreamOfs); // to the palette colors mpOStm->Seek( nCurrentPos ); for ( i = 0; i < mnColors; i++ ) @@ -362,7 +362,7 @@ ULONG nGfxBegin = mpOStm->Tell(); mpOStm->Seek( mnBitmapPos + 8 ); // the strip offset tag entry needs the offset - *mpOStm << nGfxBegin - mnStreamOfs; // to the bitmap data + *mpOStm << static_cast(nGfxBegin - mnStreamOfs); // to the bitmap data mpOStm->Seek( nGfxBegin ); StartCompression(); @@ -454,7 +454,7 @@ { ULONG nGfxEnd = mpOStm->Tell(); mpOStm->Seek( mnStripByteCountPos + 8 ); - *mpOStm << ( nGfxEnd - nGfxBegin ); // mnStripByteCountPos needs the size of the compression data + *mpOStm << static_cast( nGfxEnd - nGfxBegin ); // mnStripByteCountPos needs the size of the compression data mpOStm->Seek( nGfxEnd ); } return mbStatus; @@ -462,13 +462,13 @@ // ------------------------------------------------------------------------ -void TIFFWriter::ImplWriteResolution( ULONG nStreamPos, ULONG nResolutionUnit ) +void TIFFWriter::ImplWriteResolution( ULONG nStreamPos, sal_uInt32 nResolutionUnit ) { ULONG nCurrentPos = mpOStm->Tell(); mpOStm->Seek( nStreamPos + 8 ); *mpOStm << (UINT32)nCurrentPos - mnStreamOfs; mpOStm->Seek( nCurrentPos ); - *mpOStm << (ULONG)1; + *mpOStm << (UINT32)1; *mpOStm << nResolutionUnit; } Index: source/filter.vcl/ieps/ieps.cxx =================================================================== RCS file: /cvs/graphics/goodies/source/filter.vcl/ieps/ieps.cxx,v retrieving revision 1.10 retrieving revision 1.10.22.1 diff -u -r1.10 -r1.10.22.1 --- source/filter.vcl/ieps/ieps.cxx 9 Jan 2006 10:10:31 -0000 1.10 +++ source/filter.vcl/ieps/ieps.cxx 21 Feb 2006 12:06:35 -0000 1.10.22.1 @@ -289,9 +289,9 @@ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-dPARANOIDSAFER")); rtl::OUString arg4 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-g")); - arg4 = arg4 + rtl::OUString::valueOf(rSize.Width()); + arg4 = arg4 + rtl::OUString::valueOf(static_cast(rSize.Width())); arg4 = arg4 + rtl::OUString::valueOf(sal_Unicode('x')); - arg4 = arg4 + rtl::OUString::valueOf(rSize.Height()); + arg4 = arg4 + rtl::OUString::valueOf(static_cast(rSize.Height())); rtl::OUString arg5 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-dTextAlphaBits=4")); rtl::OUString arg6 = Index: source/filter.vcl/ios2met/ios2met.cxx =================================================================== RCS file: /cvs/graphics/goodies/source/filter.vcl/ios2met/ios2met.cxx,v retrieving revision 1.7 retrieving revision 1.7.62.1 diff -u -r1.7 -r1.7.62.1 --- source/filter.vcl/ios2met/ios2met.cxx 9 Sep 2005 02:58:26 -0000 1.7 +++ source/filter.vcl/ios2met/ios2met.cxx 21 Feb 2006 12:06:36 -0000 1.7.62.1 @@ -223,7 +223,7 @@ struct OSPalette { OSPalette * pSucc; - ULONG * p0RGB; // Darf auch NULL sein! + sal_uInt32 * p0RGB; // Darf auch NULL sein! USHORT nSize; }; @@ -243,7 +243,7 @@ struct OSPath { OSPath* pSucc; - ULONG nID; + sal_uInt32 nID; PolyPolygon aPPoly; BOOL bClosed; BOOL bStroke; @@ -266,7 +266,7 @@ // Waehrend des Lesens der Bitmap benoetigt: SvStream * pBMP; // Zeiger auf temporaere Windows-BMP-Datei oder NULL - ULONG nWidth, nHeight; + sal_uInt32 nWidth, nHeight; USHORT nBitsPerPixel; ULONG nMapPos; OSBitmap(){} ~OSBitmap(){} @@ -381,10 +381,10 @@ void SetRasterOp(RasterOp eROP); void SetPalette0RGB(USHORT nIndex, ULONG nCol); - ULONG GetPalette0RGB(ULONG nIndex); + sal_uInt32 GetPalette0RGB(sal_uInt32 nIndex); // Holt Farbe aus der Palette, oder, wenn nicht vorhanden, // interpretiert nIndex als direkten RGB-Wert. - Color GetPaletteColor(ULONG nIndex); + Color GetPaletteColor(sal_uInt32 nIndex); BOOL IsLineInfo(); @@ -720,12 +720,12 @@ pPaletteStack->nSize=0; } if (pPaletteStack->p0RGB==NULL || nIndex>=pPaletteStack->nSize) { - ULONG * pOld0RGB=pPaletteStack->p0RGB; + sal_uInt32 * pOld0RGB=pPaletteStack->p0RGB; USHORT i,nOldSize=pPaletteStack->nSize; if (pOld0RGB==NULL) nOldSize=0; pPaletteStack->nSize=2*(nIndex+1); if (pPaletteStack->nSize<256) pPaletteStack->nSize=256; - pPaletteStack->p0RGB = new ULONG[pPaletteStack->nSize]; + pPaletteStack->p0RGB = new sal_uInt32[pPaletteStack->nSize]; for (i=0; inSize; i++) { if (ip0RGB[i]=pOld0RGB[i]; else if (i==0) pPaletteStack->p0RGB[i]=0x00ffffff; @@ -736,14 +736,14 @@ pPaletteStack->p0RGB[nIndex]=nCol; } -ULONG OS2METReader::GetPalette0RGB(ULONG nIndex) +sal_uInt32 OS2METReader::GetPalette0RGB(sal_uInt32 nIndex) { if (pPaletteStack!=NULL && pPaletteStack->p0RGB!=NULL && pPaletteStack->nSize>nIndex) nIndex=pPaletteStack->p0RGB[nIndex]; return nIndex; } -Color OS2METReader::GetPaletteColor(ULONG nIndex) +Color OS2METReader::GetPaletteColor(sal_uInt32 nIndex) { nIndex=GetPalette0RGB(nIndex); return Color((((USHORT)(nIndex>>8))&0xff00)>>8, @@ -935,7 +935,7 @@ { Point aP1,aP2; Size aSize; - ULONG nID; + sal_uInt32 nID; OSBitmap * pB; long nt; @@ -1078,7 +1078,7 @@ Point aCenter; long nP,nQ,nR,nS; Rectangle aRect; - ULONG nMul; USHORT nMulS; + sal_uInt32 nMul; USHORT nMulS; if (bGivenPos) { aCenter=ReadPoint(); @@ -1126,7 +1126,7 @@ Point aP0, aCenter,aPStart,aPEnd; long nP,nQ,nR,nS,nStart, nSweep; Rectangle aRect; - ULONG nMul; USHORT nMulS; + sal_uInt32 nMul; USHORT nMulS; double fStart, fEnd; if (bGivenPos) { @@ -1172,7 +1172,7 @@ void OS2METReader::ReadPolygons() { - ULONG i,j,nNumPolys, nNumPoints; + sal_uInt32 i,j,nNumPolys, nNumPoints; PolyPolygon aPolyPoly; Polygon aPoly; Point aPoint; @@ -1533,7 +1533,7 @@ } case GOrdFilPth: { - ULONG nID; + sal_uInt32 nID; UINT16 nDummy; OSPath* p = pPathList; @@ -1586,7 +1586,7 @@ case GOrdOutPth: { - ULONG nID; + sal_uInt32 nID; USHORT i,nC; OSPath* p=pPathList; pOS2MET->SeekRel(2); @@ -1611,7 +1611,7 @@ break; } case GOrdSClPth: { OOODEBUG("GOrdSClPth",0); - ULONG nID; + sal_uInt32 nID; OSPath * p=pPathList; pOS2MET->SeekRel(2); *pOS2MET >> nID; @@ -2208,10 +2208,10 @@ return; } // Schreibe (Windows-)BITMAPINFOHEADER: - *(p->pBMP) << ((ULONG)40) << p->nWidth << p->nHeight; + *(p->pBMP) << ((sal_uInt32)40) << p->nWidth << p->nHeight; *(p->pBMP) << ((USHORT)1) << p->nBitsPerPixel; - *(p->pBMP) << ((ULONG)0) << ((ULONG)0) << ((ULONG)0) << ((ULONG)0); - *(p->pBMP) << ((ULONG)0) << ((ULONG)0); + *(p->pBMP) << ((sal_uInt32)0) << ((sal_uInt32)0) << ((sal_uInt32)0) << ((sal_uInt32)0); + *(p->pBMP) << ((sal_uInt32)0) << ((sal_uInt32)0); // Schreibe Farbtabelle: if (p->nBitsPerPixel<=8) { USHORT i, nColTabSize=1<<(p->nBitsPerPixel); Index: source/filter.vcl/ipict/ipict.cxx =================================================================== RCS file: /cvs/graphics/goodies/source/filter.vcl/ipict/ipict.cxx,v retrieving revision 1.12 retrieving revision 1.12.56.1 diff -u -r1.12 -r1.12.56.1 --- source/filter.vcl/ipict/ipict.cxx 23 Sep 2005 13:45:44 -0000 1.12 +++ source/filter.vcl/ipict/ipict.cxx 21 Feb 2006 12:06:36 -0000 1.12.56.1 @@ -295,7 +295,7 @@ Color PictReader::ReadColor() { - ULONG nCol; + sal_uInt32 nCol; Color aCol; *pPict >> nCol; @@ -635,7 +635,7 @@ USHORT ny, nx, nColTabSize; USHORT nRowBytes, nBndX, nBndY, nWidth, nHeight, nVersion, nPackType, nPixelType, nPixelSize, nCmpCount, nCmpSize; - ULONG nPackSize, nPlaneBytes, nHRes, nVRes; + sal_uInt32 nPackSize, nPlaneBytes, nHRes, nVRes; BYTE nDat, nRed, nGreen, nBlue, nDummy; ULONG i, nDataSize = 0; @@ -1778,7 +1778,7 @@ default: // 0x00a2 bis 0xffff (zumeist Reserved) if (nOpcode<=0x00af) { *pPict >> nUSHORT; nDataSize=2+nUSHORT; } else if (nOpcode<=0x00cf) { nDataSize=0; } - else if (nOpcode<=0x00fe) { *pPict >> nDataSize; nDataSize+=4; } + else if (nOpcode<=0x00fe) { sal_uInt32 nTemp; *pPict >> nTemp ; nDataSize = nTemp; nDataSize+=4; } else if (nOpcode==0x00ff) { nDataSize=2; } // OpEndPic else if (nOpcode<=0x01ff) { nDataSize=2; } else if (nOpcode<=0x0bfe) { nDataSize=4; } @@ -1787,7 +1787,7 @@ else if (nOpcode<=0x7eff) { nDataSize=24; } else if (nOpcode<=0x7fff) { nDataSize=254; } else if (nOpcode<=0x80ff) { nDataSize=0; } - else { *pPict >> nDataSize; nDataSize+=4; } + else { sal_uInt32 nTemp; *pPict >> nTemp ; nDataSize = nTemp; nDataSize+=4; } } if (nDataSize==0xffffffff) { Index: source/filter.vcl/iras/iras.cxx =================================================================== RCS file: /cvs/graphics/goodies/source/filter.vcl/iras/iras.cxx,v retrieving revision 1.4 retrieving revision 1.4.62.1 diff -u -r1.4 -r1.4.62.1 --- source/filter.vcl/iras/iras.cxx 9 Sep 2005 03:01:23 -0000 1.4 +++ source/filter.vcl/iras/iras.cxx 21 Feb 2006 12:06:36 -0000 1.4.62.1 @@ -62,11 +62,11 @@ BOOL mbStatus; Bitmap maBmp; BitmapWriteAccess* mpAcc; - ULONG mnWidth, mnHeight; // Bildausmass in Pixeln + sal_uInt32 mnWidth, mnHeight; // Bildausmass in Pixeln USHORT mnDstBitsPerPix; USHORT mnDstColors; - ULONG mnDepth, mnImageDatSize, mnType; - ULONG mnColorMapType, mnColorMapSize; + sal_uInt32 mnDepth, mnImageDatSize, mnType; + sal_uInt32 mnColorMapType, mnColorMapSize; BYTE mnRepCount, mnRepVal; // RLE Decoding BOOL mbPalette; Index: source/filter.vcl/itiff/itiff.cxx =================================================================== RCS file: /cvs/graphics/goodies/source/filter.vcl/itiff/itiff.cxx,v retrieving revision 1.6 retrieving revision 1.6.62.2 diff -u -r1.6 -r1.6.62.2 --- source/filter.vcl/itiff/itiff.cxx 9 Sep 2005 03:02:52 -0000 1.6 +++ source/filter.vcl/itiff/itiff.cxx 23 Feb 2006 08:38:02 -0000 1.6.62.2 @@ -266,7 +266,7 @@ double TIFFReader::ReadDoubleData() { - ULONG nulong; + sal_uInt32 nulong; double nd; if ( nDataType == 5 ) @@ -1061,12 +1061,8 @@ { USHORT i, nNumTags, nTagType; ULONG nMaxPos; - ULONG nFirstIfd, nDataLen, nPos; - ULONG* pDummy = new ULONG; delete pDummy; // damit unter OS/2 - // das richtige (Tools-)new - // verwendet wird, da es sonst - // in dieser DLL nur Vector-news - // gibt; + ULONG nPos; + sal_uInt32 nFirstIfd, nDataLen; bStatus = TRUE; pCallback = pcallback; @@ -1090,7 +1086,7 @@ if ( bStatus ) { - ULONG nOffset = nFirstIfd; + sal_uInt32 nOffset = nFirstIfd; // calculate length of TIFF file do