Commit 33d470ce authored by johannes hanika's avatar johannes hanika

support for greg wards hdr format.

parent f97a29c8
0.4 lighttable release
- replace white by exposure: w = 2^-exp
- exposure: highlight clipped parts
- hdr exr import
- tonemapping widget?
......
......@@ -2,8 +2,8 @@ SUBDIRS=LibRaw iop views # gegl-operations
include shared.am
AM_CFLAGS+=-Werror -rdynamic
noinst_LIBRARIES=libdarktable.a
libdarktable_a_SOURCES=control/jobs.c gui/gtk.c gui/navigation.c gui/histogram.c develop/develop.c develop/imageop.c common/imageio.c common/darktable.c control/control.c common/film.c common/image.c common/image_cache.c common/image_compression.c gui/metadata.c develop/pixelpipe.c common/exif.cc common/imageio_jpeg.c common/imageio_png.c common/imageio_pfm.c views/view.c
libdarktable_a_SOURCES=control/jobs.c gui/gtk.c gui/navigation.c gui/histogram.c develop/develop.c develop/imageop.c common/imageio.c common/darktable.c control/control.c common/film.c common/image.c common/image_cache.c common/image_compression.c gui/metadata.c develop/pixelpipe.c common/exif.cc common/imageio_jpeg.c common/imageio_png.c common/imageio_pfm.c common/imageio_rgbe.c views/view.c
bin_PROGRAMS=darktable
darktable_SOURCES=main.c
darktable_LDADD=$(OPENMP_CFLAGS) $(GEGL_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(CAIRO_LIBS) $(GLADE_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(SQLITE_LIBS) libdarktable.a LibRaw/libraw_r.a -lstdc++
noinst_HEADERS=gui/gtk.h gui/histogram.h gui/navigation.h gui/draw.h develop/develop.h develop/imageop.h common/nikon_curve.h common/darktable.h common/imageio.h common/film.h control/settings.h control/control.h control/jobs.h common/image.h common/image_cache.h common/image_compression.h gui/metadata.h develop/pixelpipe.h develop/pixelpipe_hb.h develop/pixelpipe_cache.h develop/pixelpipe_hb.c develop/pixelpipe_gegl.c develop/pixelpipe_cache.c common/exif.h common/imageio_jpeg.h common/imageio_png.h common/imageio_pfm.h common/nikon_curve.c views/view.h
noinst_HEADERS=gui/gtk.h gui/histogram.h gui/navigation.h gui/draw.h develop/develop.h develop/imageop.h common/nikon_curve.h common/darktable.h common/imageio.h common/film.h control/settings.h control/control.h control/jobs.h common/image.h common/image_cache.h common/image_compression.h gui/metadata.h develop/pixelpipe.h develop/pixelpipe_hb.h develop/pixelpipe_cache.h develop/pixelpipe_hb.c develop/pixelpipe_gegl.c develop/pixelpipe_cache.c common/exif.h common/imageio_jpeg.h common/imageio_png.h common/imageio_pfm.h common/imageio_rgbe.h common/nikon_curve.c views/view.h
......@@ -6,6 +6,7 @@
#include "common/imageio_jpeg.h"
#include "common/imageio_png.h"
#include "common/imageio_pfm.h"
#include "common/imageio_rgbe.h"
#include "common/image_compression.h"
#include "common/darktable.h"
#include "common/exif.h"
......@@ -277,6 +278,7 @@ int dt_imageio_open_hdr_preview(dt_image_t *img, const char *filename)
int dt_imageio_open_hdr(dt_image_t *img, const char *filename)
{
if(!dt_imageio_open_rgbe(img, filename)) return 0;
if(!dt_imageio_open_pfm(img, filename)) return 0;
return 1;
}
......
......@@ -16,6 +16,7 @@ int dt_imageio_open_pfm(dt_image_t *img, const char *filename)
while(*ext != '.' && ext > filename) ext--;
if(strncmp(ext, ".pfm", 4) && strncmp(ext, ".PFM", 4) && strncmp(ext, ".Pfm", 4)) return 1;
FILE *f = fopen(filename, "rb");
if(!f) return 1;
int ret = 0;
int cols = 3;
char head[2] = {'X', 'X'};
......
This diff is collapsed.
#ifndef DT_IMAGEIO_RGBE_H
#define DT_IMAGEIO_RGBE_H
#include "common/image.h"
int dt_imageio_open_rgbe(dt_image_t *img, const char *filename);
#endif
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