Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/flickernoise
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a7e1867
Choose a base ref
...
head repository: m-labs/flickernoise
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d4ef921
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 15, 2012

  1. pixbuf: record filename for JPEG (thanks Werner for reporting)

    Sebastien Bourdeauducq committed Jan 15, 2012
    Copy the full SHA
    3e87d0e View commit details

  2. Merge branch 'master' of github.com:milkymist/flickernoise

    Sebastien Bourdeauducq committed Jan 15, 2012
    Copy the full SHA
    d4ef921 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 src/pixbuf/loaderjpeg.c
2 changes: 2 additions & 0 deletions src/pixbuf/loaderjpeg.c
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <setjmp.h>
#include <string.h>
#include <jpeglib.h>

#include "pixbuf.h"
@@ -75,6 +76,7 @@ struct pixbuf *pixbuf_load_jpeg(char *filename)

ret = pixbuf_new(cinfo.image_width, cinfo.image_height);
if(ret == NULL) goto free5;
ret->filename = strdup(filename);
if(!pixbuf_dither(ret->pixels, row_pointers, cinfo.image_width, cinfo.image_height, 0)) {
pixbuf_dec_ref(ret);
ret = NULL;