IrixDMJpegCompressor is now preferred to IrixCLJpegCompressor. Debugging behavior was either removed or made dependent on the DEBUG_FORCE_CL define. This define allows testing of Irix CL software-only JPEG compressor which normally would not be used.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2377 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/rfb/IrixCLJpegCompressor.cxx b/common/rfb/IrixCLJpegCompressor.cxx
index 3e33a0c..5fef166 100644
--- a/common/rfb/IrixCLJpegCompressor.cxx
+++ b/common/rfb/IrixCLJpegCompressor.cxx
@@ -45,16 +45,15 @@
return;
}
- // DEBUG: Uncomment to test without hardware compressor.
- /*
- vlog.debug("Trying Irix software JPEG compressor (debug mode!)");
+#ifdef DEBUG_FORCE_CL
+ vlog.debug("DEBUG: Trying Irix software JPEG compressor");
r = clOpenCompressor(CL_JPEG_SOFTWARE, &m_clHandle);
if (r == SUCCESS) {
- vlog.debug("Using Irix software JPEG compressor (debug mode!)");
+ vlog.debug("DEBUG: Using Irix software JPEG compressor");
m_clHandleValid = true;
return;
}
- */
+#endif
vlog.error("Ho hardware JPEG available via Irix CL library");
}
@@ -129,16 +128,6 @@
// Determine buffer size required.
int newBufferSize = clGetParam(m_clHandle, CL_COMPRESSED_BUFFER_SIZE);
- /* DEBUG:
- int arr[200];
- int nn = clQueryParams(m_clHandle, arr, 200);
- vlog.debug("Params:");
- for (int ii = 0; ii < nn; ii += 2) {
- int id = clGetParamID(m_clHandle, (char *)arr[ii]);
- vlog.debug(" %s = %d", (char*)arr[ii], clGetParam(m_clHandle, id));
- }
- */
-
// (Re)allocate destination buffer if necessary.
if (newBufferSize > m_dstBufferSize) {
if (m_compressedData)