[Libreoffice-commits] core.git: jpeg/ExternalPackage_jpeg.mk vcl/source
Tomaž Vajngerl
quikee at gmail.com
Sun Apr 21 14:33:50 PDT 2013
jpeg/ExternalPackage_jpeg.mk | 1 +
vcl/source/filter/jpeg/Exif.cxx | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 8ecf0d45d8301b95385eda64671df828c3003c62
Author: Tomaž Vajngerl <quikee at gmail.com>
Date: Sun Apr 21 23:31:03 2013 +0200
Add jpegint.h to jpeg module. Fix warning in Exif.
Change-Id: I098ad140d013f1bda057416b2e0622bc038d2a30
diff --git a/jpeg/ExternalPackage_jpeg.mk b/jpeg/ExternalPackage_jpeg.mk
index c451ed5..66cfc91 100644
--- a/jpeg/ExternalPackage_jpeg.mk
+++ b/jpeg/ExternalPackage_jpeg.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,jpeg_inc,inc/external/jpeg,\
jconfig.h \
jerror.h \
jmorecfg.h \
+ jpegint.h \
jpeglib.h \
))
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index d15cc4c..167cf54 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -62,7 +62,7 @@ sal_Int32 Exif::getRotation()
case LEFT_BOTTOM:
return 900;
default:
- return 0;
+ break;
}
return 0;
}
@@ -93,7 +93,6 @@ bool Exif::write(SvStream& rStream)
bool Exif::processJpeg(SvStream& rStream, bool bSetValue)
{
sal_uInt16 aMagic16;
- sal_uInt8 aMarker;
sal_uInt16 aLength;
rStream.Seek(STREAM_SEEK_TO_END);
@@ -113,7 +112,9 @@ bool Exif::processJpeg(SvStream& rStream, bool bSetValue)
while(true)
{
+ sal_uInt8 aMarker = 0xD9;
sal_Int32 aCount;
+
for (aCount = 0; aCount < 7; aCount++)
{
rStream >> aMarker;
More information about the Libreoffice-commits
mailing list