author | Rekhesh Mohan <reks@iiap.res.in> | |
Thu, 8 Nov 2012 08:10:53 +0000 (13:40 +0530) | ||
committer | Rekhesh Mohan <reks@iiap.res.in> | |
Thu, 8 Nov 2012 08:10:53 +0000 (13:40 +0530) |
Conflicts:
ChangeLog.txt
configure.ac
src/filesys.c
src/fits2jpeg.c
src/image.c
ChangeLog.txt
configure.ac
src/filesys.c
src/fits2jpeg.c
src/image.c
.gitignore | patch | blob | history | |
ChangeLog.txt | patch | blob | history | |
configure.ac | patch | blob | history | |
src/filesys.c | patch | blob | history | |
src/fits2jpeg.c | patch | blob | history | |
src/getopt.c | patch | blob | history | |
src/image.c | patch | blob | history |
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
stamp-h1
*~
.*.swp
+.*swp
*.bak
*.lock
diff --git a/ChangeLog.txt b/ChangeLog.txt
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
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
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
-AC_INIT([CADS_fits2jpeg], [2.0], [cads@iiap.res.in])
+AC_INIT([CADS_fits2jpeg], [2.1], [cads@iiap.res.in])
AC_LANG_C
AM_INIT_AUTOMAKE([-Wall -Werror])
AC_CONFIG_SRCDIR([config.h.in])
diff --git a/src/filesys.c b/src/filesys.c
--- a/src/filesys.c
+++ b/src/filesys.c
/*Header Definitions*/
#include "fits2jpeg.h"
-/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*
* MAKE_DIR: Wrapper to mkdir() with some basic error checks
diff --git a/src/fits2jpeg.c b/src/fits2jpeg.c
--- a/src/fits2jpeg.c
+++ b/src/fits2jpeg.c
Reks 28 June 2012
1. rebranded to CADS/UVS
- Reks 05-10 July 2012 v2.0 plans
+ Reks 05-10 July 2012 v2.0
1. Merged scale & operations to single flag
2. added fits2jpeg.h, help/banner functions moved to messages.c
3. Options to clip image min/max
7. Image resizing
8. moved fits read to image.c
9. Option to specify output directory
+
+ Reks Oct/Nov 2012 v2.1
+ 1. Fixed a segfault on zero/blank fits images
*---------------------------------------------------------------------------*/
#include "fits2jpeg.h"
diff --git a/src/getopt.c b/src/getopt.c
--- a/src/getopt.c
+++ b/src/getopt.c
(void)fprintf(stderr,
"ERROR : option requires an argument -- %c\n",
optopt);
- return (BADCH);
+ exit (BADCH);
}
else /* white space */
optarg = nargv[optindex];
diff --git a/src/image.c b/src/image.c
--- a/src/image.c
+++ b/src/image.c
/* 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;
+
for (i = 0; i < npixels; ++i)
data[i] = (data[i] - datamin)/scl_data;