* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+/** This is a Will Not Fix */
+#pragma GCC diagnostic ignored "-Wclobbered"
+
#include "main.h"
#include "image-load.h"
#ifdef HAVE_JPEG
-#include <setjmp.h>
-#include <jpeglib.h>
+#include <csetjmp>
#include <jerror.h>
+#include <jpeglib.h>
-typedef struct _ImageLoaderJpeg ImageLoaderJpeg;
-struct _ImageLoaderJpeg {
+struct ImageLoaderJpeg {
ImageLoaderBackendCbAreaUpdated area_updated_cb;
ImageLoaderBackendCbSize size_cb;
ImageLoaderBackendCbAreaPrepared area_prepared_cb;
explode_gray_into_buf (struct jpeg_decompress_struct *cinfo,
guchar **lines)
{
- gint i, j;
+ gint i;
+ gint j;
guint w;
- g_return_if_fail (cinfo != NULL);
+ g_return_if_fail (cinfo != nullptr);
g_return_if_fail (cinfo->output_components == 1);
g_return_if_fail (cinfo->out_color_space == JCS_GRAYSCALE);
*/
w = cinfo->output_width;
for (i = cinfo->rec_outbuf_height - 1; i >= 0; i--) {
- guchar *from, *to;
+ guchar *from;
+ guchar *to;
from = lines[i] + w - 1;
to = lines[i] + (w - 1) * 3;
gint i;
guint j;
- g_return_if_fail (cinfo != NULL);
+ g_return_if_fail (cinfo != nullptr);
g_return_if_fail (cinfo->output_components == 4);
g_return_if_fail (cinfo->out_color_space == JCS_CMYK);
p = lines[i];
for (j = 0; j < cinfo->output_width; j++) {
- int c, m, y, k;
+ int c;
+ int m;
+ int y;
+ int k;
c = p[0];
m = p[1];
y = p[2];
static gpointer image_loader_jpeg_new(ImageLoaderBackendCbAreaUpdated area_updated_cb, ImageLoaderBackendCbSize size_cb, ImageLoaderBackendCbAreaPrepared area_prepared_cb, gpointer data)
{
- ImageLoaderJpeg *loader = g_new0(ImageLoaderJpeg, 1);
+ auto loader = g_new0(ImageLoaderJpeg, 1);
loader->area_updated_cb = area_updated_cb;
loader->size_cb = size_cb;
loader->area_prepared_cb = area_prepared_cb;
loader->data = data;
- return (gpointer) loader;
+ return loader;
}
static void
struct error_handler_data *errmgr;
char buffer[JMSG_LENGTH_MAX];
- errmgr = (struct error_handler_data *) cinfo->err;
+ errmgr = reinterpret_cast<struct error_handler_data *>(cinfo->err);
/* Create the message */
(* cinfo->err->format_message) (cinfo, buffer);
/* broken check for *error == NULL for robustness against
* crappy JPEG library
*/
- if (errmgr->error && *errmgr->error == NULL) {
+ if (errmgr->error && *errmgr->error == nullptr) {
g_set_error (errmgr->error,
GDK_PIXBUF_ERROR,
cinfo->err->msg_code == JERR_OUT_OF_MEMORY
}
static void
-output_message_handler (j_common_ptr UNUSED(cinfo))
+output_message_handler (j_common_ptr)
{
/* This method keeps libjpeg from dumping crap to stderr */
}
-static void init_source (j_decompress_ptr UNUSED(cinfo)) {}
+static void init_source (j_decompress_ptr) {}
static boolean fill_input_buffer (j_decompress_ptr cinfo)
{
ERREXIT(cinfo, JERR_INPUT_EMPTY);
}
static void skip_input_data (j_decompress_ptr cinfo, long num_bytes)
{
- struct jpeg_source_mgr* src = (struct jpeg_source_mgr*) cinfo->src;
+ auto src = static_cast<struct jpeg_source_mgr*>(cinfo->src);
- if ((gulong)num_bytes > src->bytes_in_buffer)
+ if (static_cast<gulong>(num_bytes) > src->bytes_in_buffer)
{
ERREXIT(cinfo, JERR_INPUT_EOF);
}
else if (num_bytes > 0)
{
- src->next_input_byte += (size_t) num_bytes;
- src->bytes_in_buffer -= (size_t) num_bytes;
+ src->next_input_byte += static_cast<size_t>(num_bytes);
+ src->bytes_in_buffer -= static_cast<size_t>(num_bytes);
}
}
-static void term_source (j_decompress_ptr UNUSED(cinfo)) {}
+static void term_source (j_decompress_ptr) {}
static void set_mem_src (j_decompress_ptr cinfo, void* buffer, long nbytes)
{
struct jpeg_source_mgr* src;
- if (cinfo->src == NULL)
+ if (cinfo->src == nullptr)
{ /* first time for this JPEG object? */
- cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) (
- (j_common_ptr) cinfo, JPOOL_PERMANENT,
- sizeof(struct jpeg_source_mgr));
+ cinfo->src = static_cast<struct jpeg_source_mgr *>((*cinfo->mem->alloc_small) (
+ reinterpret_cast<j_common_ptr>(cinfo), JPOOL_PERMANENT,
+ sizeof(struct jpeg_source_mgr)));
}
- src = (struct jpeg_source_mgr*) cinfo->src;
+ src = static_cast<struct jpeg_source_mgr*>(cinfo->src);
src->init_source = init_source;
src->fill_input_buffer = fill_input_buffer;
src->skip_input_data = skip_input_data;
src->resync_to_restart = jpeg_resync_to_restart; /* use default method */
src->term_source = term_source;
src->bytes_in_buffer = nbytes;
- src->next_input_byte = (JOCTET*)buffer;
+ src->next_input_byte = static_cast<JOCTET*>(buffer);
}
static gboolean image_loader_jpeg_load (gpointer loader, const guchar *buf, gsize count, GError **error)
{
- ImageLoaderJpeg *lj = (ImageLoaderJpeg *) loader;
+ auto lj = static_cast<ImageLoaderJpeg *>(loader);
struct jpeg_decompress_struct cinfo;
struct jpeg_decompress_struct cinfo2;
- guchar *dptr, *dptr2;
+ guchar *dptr;
+ guchar *dptr2;
guint rowstride;
- guchar *stereo_buf2 = NULL;
+ guchar *stereo_buf2 = nullptr;
guint stereo_length = 0;
struct error_handler_data jerr;
lj->stereo = FALSE;
-// DEBUG_1("TG: JPG requested size w=%d:h=%d", lj->requested_width > 0, lj->requested_height);
MPOData *mpo = jpeg_get_mpo_data(buf, count);
if (mpo && mpo->num_images > 1)
{
guint i;
- gint idx1 = -1, idx2 = -1;
+ gint idx1 = -1;
+ gint idx2 = -1;
guint num2 = 1;
for (i = 0; i < mpo->num_images; i++)
if (idx1 >= 0 && idx2 >= 0)
{
lj->stereo = TRUE;
- stereo_buf2 = (unsigned char *)buf + mpo->images[idx2].offset;
+ stereo_buf2 = const_cast<unsigned char *>(buf) + mpo->images[idx2].offset;
stereo_length = mpo->images[idx2].length;
- buf = (unsigned char *)buf + mpo->images[idx1].offset;
+ buf = const_cast<unsigned char *>(buf) + mpo->images[idx1].offset;
count = mpo->images[idx1].length;
}
}
jerr.error = error;
- if (setjmp(jerr.setjmp_buffer))
+ if (sigsetjmp(jerr.setjmp_buffer, 0))
{
/* If we get here, the JPEG code has signaled an error.
* We need to clean up the JPEG object, close the input file, and return.
jpeg_create_decompress(&cinfo);
- set_mem_src(&cinfo, (unsigned char *)buf, count);
+ set_mem_src(&cinfo, const_cast<unsigned char *>(buf), count);
jpeg_read_header(&cinfo, TRUE);
lj->requested_width = lj->stereo ? cinfo.image_width * 2: cinfo.image_width;
lj->requested_height = cinfo.image_height;
-// DEBUG_1("TG: JPG requested size v2 w=%d:h=%d", lj->requested_width > 0, lj->requested_height);
lj->size_cb(loader, lj->requested_width, lj->requested_height, lj->data);
cinfo.scale_num = 1;
static void image_loader_jpeg_set_size(gpointer loader, int width, int height)
{
- ImageLoaderJpeg *lj = (ImageLoaderJpeg *) loader;
+ auto lj = static_cast<ImageLoaderJpeg *>(loader);
lj->requested_width = width;
lj->requested_height = height;
}
static GdkPixbuf* image_loader_jpeg_get_pixbuf(gpointer loader)
{
- ImageLoaderJpeg *lj = (ImageLoaderJpeg *) loader;
+ auto lj = static_cast<ImageLoaderJpeg *>(loader);
return lj->pixbuf;
}
-static gchar* image_loader_jpeg_get_format_name(gpointer UNUSED(loader))
+static gchar* image_loader_jpeg_get_format_name(gpointer)
{
return g_strdup("jpeg");
}
-static gchar** image_loader_jpeg_get_format_mime_types(gpointer UNUSED(loader))
+static gchar** image_loader_jpeg_get_format_mime_types(gpointer)
{
- static gchar *mime[] = {"image/jpeg", NULL};
- return g_strdupv(mime);
+ static const gchar *mime[] = {"image/jpeg", nullptr};
+ return g_strdupv(const_cast<gchar **>(mime));
}
-static gboolean image_loader_jpeg_close(gpointer UNUSED(loader), GError **UNUSED(error))
+static gboolean image_loader_jpeg_close(gpointer, GError **)
{
return TRUE;
}
static void image_loader_jpeg_abort(gpointer loader)
{
- ImageLoaderJpeg *lj = (ImageLoaderJpeg *) loader;
+ auto lj = static_cast<ImageLoaderJpeg *>(loader);
lj->abort = TRUE;
}
static void image_loader_jpeg_free(gpointer loader)
{
- ImageLoaderJpeg *lj = (ImageLoaderJpeg *) loader;
+ auto lj = static_cast<ImageLoaderJpeg *>(loader);
if (lj->pixbuf) g_object_unref(lj->pixbuf);
g_free(lj);
}
funcs->loader_new = image_loader_jpeg_new;
funcs->set_size = image_loader_jpeg_set_size;
funcs->load = image_loader_jpeg_load;
- funcs->write = NULL;
+ funcs->write = nullptr;
funcs->get_pixbuf = image_loader_jpeg_get_pixbuf;
funcs->close = image_loader_jpeg_close;
funcs->abort = image_loader_jpeg_abort;
projects / geeqie.git / blobdiff