From: Rekhesh Mohan <reks@iiap.res.in>
Date: Thu, 8 Nov 2012 08:10:53 +0000 (+0530)
Subject: Merge branch 'testing' now v2.1
X-Git-Url: https://cads.iiap.res.in/gitview/?p=fits2jpeg.git;a=commitdiff_plain;h=HEAD;hp=-c

Merge branch 'testing' now v2.1

Conflicts:
	ChangeLog.txt
	configure.ac
	src/filesys.c
	src/fits2jpeg.c
	src/image.c
---

ca5520b0c818f4ad57e2e57d557fc999f9dfe3c7
diff --combined ChangeLog.txt
index e10220c,af372c5..353882a
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@@ -6,10 -6,14 +6,14 @@@ NOTE: This file records the changes mad
  version fits2jpeg-1.0
  ------------------------------------------------------------------------
  
+ 2.1 Release
+ -----------
  
+   1. Fixed a segfault on blank/zero images
  
- Updates in 2.0 Release
- ----------------------
+ 
+ 2.0 Release
+ -----------
  
    1. Merged scale & operations to single flag
       v1.0 had normalize/equalize handled by "-e" flag and rest of
@@@ -25,13 -29,9 +29,13 @@@
       A negative image can be generated using "-n" flag.
  
    4. New option to resize image
 -     zoom or shrink output image using "-z <zoomfact>".
 +     zoom or shrink output image by "-z <zoomfact>".
  
    5. New option to choose jpeg quality factor
 -     You can choose the jpeg quality factor using "-q <quality>"
 +     You can choose the jpeg quality factor by "-q <quality>"
       Quality factor was fixed at 100 in previous release.
  
 +  6. New option to specify output directory for saving jpeg images
 +     Output location can be specified by "-d </path/to/folder>"
 +     If the target directory does not exist, the whole tree will be
 +     created.
diff --combined src/filesys.c
index e7ff547,873f891..8e40c52
--- a/src/filesys.c
+++ b/src/filesys.c
@@@ -23,11 -23,8 +23,10 @@@
  
  /*Header Definitions*/
  #include "fits2jpeg.h"
- /*---------------------------------------------------------------------------*/
  
 -/*---------------------------------------------------------------------------*/
 +/*---------------------------------------------------------------------------*
 + * MAKE_DIR: Wrapper to mkdir() with some basic error checks
 + *---------------------------------------------------------------------------*/
  int make_dir(char * folder, mode_t mode)
  {
      struct stat st;
@@@ -44,10 -41,6 +43,10 @@@
      return status;
  }
  
 +/*---------------------------------------------------------------------------*
 + * MAKE_TREE: moves through a directory path and creates directories and
 + *            subdirectories using make_dir(), top-down.
 + *---------------------------------------------------------------------------*/
  int make_tree(char * folder, mode_t mode)
  {
      char *pp;
@@@ -72,9 -65,6 +71,9 @@@
      return status;
  }
  
 +/*---------------------------------------------------------------------------*
 + * STRDUP: This one is not a part of ANSI-strict, so we had to write one
 + *---------------------------------------------------------------------------*/
  char *strdup(const char *str)
  {
      int n = strlen(str) + 1;
diff --combined src/image.c
index a47b9b7,7f7a8e8..819158b
--- a/src/image.c
+++ b/src/image.c
@@@ -24,9 -24,6 +24,9 @@@
  /*Header Definitions*/
  #include "fits2jpeg.h"
  
 +/*---------------------------------------------------------------------------*
 + * READ_FITS: To reads data from a fits image file.. (isn't that obvious?)
 + *---------------------------------------------------------------------------*/
  void read_fits(char * fits_file_name, long * xdim, long * ydim, float ** data)
  {
      fitsfile *fptr;
@@@ -82,6 -79,9 +82,9 @@@ void scale_pixels(int scale, unsigned i
      /* the dynamic range is reduced to 255 for jpeg                         */
      scl_data = (datamax - datamin)/(float)JMAXVAL;
  
+     /* we will end up with segfaults if scl_data = 0                        */
 -    if (scl_data = 0) scl_data = 1;
++    if (scl_data == 0) scl_data = 1;
+ 
      for (i = 0; i < npixels; ++i)
          data[i] = (data[i] - datamin)/scl_data;