Commit 1ddfca94 authored by johannes hanika's avatar johannes hanika

removed annoying meaningless output.

parent a830a586
......@@ -18,25 +18,9 @@
#ifndef DT_IMAGEIO_TIFF_H
#define DT_IMAGEIO_TIFF_H
#include <stdlib.h>
#include <stdio.h>
#include <inttypes.h>
#include <tiffio.h>
#include "common/image.h"
typedef struct dt_imageio_tiff_t
{
uint32 width, height;
TIFF *handle;
} dt_imageio_tiff_t;
dt_imageio_retval_t dt_imageio_open_tiff(dt_image_t *img, const char *filename);
dt_imageio_retval_t dt_imageio_open_tiff_preview(dt_image_t *img, const char *filename);
/** write 8-bit tiff file, with exif if not NULL. */
int dt_imageio_tiff_write_8(const char *filename, const uint8_t *in, const int width, const int height, void *exif, int exif_len);
int dt_imageio_tiff_write_with_icc_profile_8(const char *filename, const uint8_t *in, const int width, const int height, void *exif, int exif_len,int imgid);
/** write 16-bit tiff file, with exif if not NULL. */
int dt_imageio_tiff_write_16(const char *filename, const uint16_t *in, const int width, const int height, void *exif, int exif_len);
int dt_imageio_tiff_write_with_icc_profile_16(const char *filename, const uint16_t *in, const int width, const int height, void *exif, int exif_len,int imgid);
/** read tiff header from file, leave file descriptor open until tiff_read is called. */
int dt_imageio_tiff_read_header(const char *filename, dt_imageio_tiff_t *jpg);
/** reads the jpeg to the (sufficiently allocated) buffer, closes file. */
int dt_imageio_tiff_read(dt_imageio_tiff_t *jpg, uint8_t *out);
#endif
......@@ -585,9 +585,10 @@ static void _slider_destroy(GtkObject *object)
g_return_if_fail(DTGTK_IS_SLIDER(object));
slider = DTGTK_SLIDER(object);
// this is a very annoying workaround for a weird bug in gtk2.0-0 2.19.6 in ubuntu lucid:
if(GTK_IS_WIDGET(slider->hbox))
gtk_widget_destroy(GTK_WIDGET(slider->hbox));
// this is a very annoying workaround for a weird bug in libgtk2.0-0 2.19.6 in ubuntu lucid:
#if (GTK_MAJOR_VERSION==2) && (GTK_MINOR_VERSION<=20) && (GTK_MICRO_VERSION==1)
if(GTK_IS_WIDGET(slider->hbox)) gtk_widget_destroy(GTK_WIDGET(slider->hbox));
#endif
// but at least the hbox seems to destroy the entry as well:
// this causes uninitialized mem accesses and segfaults somewhere.. (??)
// g_assert( !GTK_IS_WIDGET(slider->entry));
......
......@@ -248,7 +248,7 @@ void gui_update(struct dt_iop_module_t *self)
prof = g_list_next(prof);
}
gtk_combo_box_set_active(g->cbox2, 0);
fprintf(stderr, "[colorin] could not find requested profile `%s'!\n", p->iccprofile);
if(strcmp(p->iccprofile, "darktable")) fprintf(stderr, "[colorin] could not find requested profile `%s'!\n", p->iccprofile);
}
void init(dt_iop_module_t *module)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment