aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/Jpeg.cpp
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-11-13 09:27:53 +0100
committerReinhard Tartler <siretart@tauware.de>2011-11-13 09:27:53 +0100
commit477961678194817aaf1aaf3602f1c91d288a539d (patch)
treed66356753053a34f93b4f6059631e0f6c4eb298c /nxcomp/Jpeg.cpp
parent799bf672a3588f205bd18ef39d9908069e0cd6d5 (diff)
downloadnx-libs-nxcomp/3.4.0-6.tar.gz
nx-libs-nxcomp/3.4.0-6.tar.bz2
nx-libs-nxcomp/3.4.0-6.zip
Imported nxcomp-3.4.0-6.tar.gznxcomp/3.4.0-6
Summary: Imported nxcomp-3.4.0-6.tar.gz Keywords: Imported nxcomp-3.4.0-6.tar.gz into Git repository
Diffstat (limited to 'nxcomp/Jpeg.cpp')
-rw-r--r--nxcomp/Jpeg.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/nxcomp/Jpeg.cpp b/nxcomp/Jpeg.cpp
index 70d4a95ac..b3973227c 100644
--- a/nxcomp/Jpeg.cpp
+++ b/nxcomp/Jpeg.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
/* */
-/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */
+/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXCOMP, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
@@ -91,6 +91,8 @@ static int DecompressJpeg24(unsigned char *compressedData, int compressedLen,
static int DecompressJpeg32(unsigned char *compressedData, int compressedLen,
unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder);
+void UnpackJpegErrorHandler(j_common_ptr cinfo);
+
//
// Colormap stuff.
//
@@ -142,8 +144,8 @@ int UnpackJpeg(T_geometry *geometry, unsigned char method, unsigned char *srcDat
// Check if data is coming from a failed unsplit.
//
- if (srcSize < 2 || srcData[0] == SPLIT_PATTERN &&
- srcData[1] == SPLIT_PATTERN)
+ if (srcSize < 2 || (srcData[0] == SPLIT_PATTERN &&
+ srcData[1] == SPLIT_PATTERN))
{
#ifdef WARNING
*logofs << "UnpackJpeg: WARNING! Skipping unpack of dummy data.\n"