Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rolkar/x3f
base: f61677342b
...
head fork: rolkar/x3f
compare: df327e5ab1
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on Oct 02, 2011
Roland Karlsson todo 342cb32
Commits on Mar 25, 2012
Roland Karlsson Dump TIFF as default df327e5
Showing with 15 additions and 5 deletions.
  1. +3 −0  doc/changes.txt
  2. +4 −0 doc/todo.txt
  3. +8 −5 src/x3f_extract.c
View
3  doc/changes.txt
@@ -1,3 +1,6 @@
+x3f_041: Roland 2012-03-25
+ Dump TIFF as default
+
x3f_040: Roland 2011-10-02
Added support for X530
View
4 doc/todo.txt
@@ -11,10 +11,14 @@ NOW
* Logic for getting thumbs images is wrong. There might be two
and they might be of same type but different size.
+* Reading the CAMF data values
+
--------------------------------------------------------------------
LONG TERM
--------------------------------------------------------------------
+* Coding of images ??
+
* Making a color correct image
* Making B&W images
View
13 src/x3f_extract.c
@@ -18,9 +18,10 @@ static void usage(char *progname)
"usage: %s [-jpg]"
" [{-raw|-tiff [-gamma <GAMMA> [-min <MIN>] [-max <MAX>]]}]"
" <file1> ...\n"
- " -jpg: Dump embedded JPG\n"
+ " -jpg: Dump embedded JPG. Turn off RAW dumping\n"
+ " -no-raw: Do not dump any RAW\n"
" -raw: Dump RAW area undecoded\n"
- " -tiff: Dump RAW as 3x16 bit TIFF\n"
+ " -tiff: Dump RAW as 3x16 bit TIFF (default)\n"
" -ppm-ascii: Dump RAW as 3x16 bit PPM of type P3 (ascii)\n"
" NOTE: 16 bit PPM/P3 is not generally supported\n"
" -ppm: Dump RAW as 3x16 bit PPM of type P6 (binary)\n"
@@ -34,18 +35,20 @@ static void usage(char *progname)
int main(int argc, char *argv[])
{
int extract_jpg = 0;
- int extract_raw = 0;
+ int extract_raw = 1;
int min = -1;
int max = -1;
double gamma = -1.0;
- raw_file_type_t file_type = NONE;
+ raw_file_type_t file_type = TIFF;
int files = 0;
int i;
for (i=1; i<argc; i++)
if (!strcmp(argv[i], "-jpg"))
- extract_jpg = 1;
+ extract_raw = 0, file_type = NONE, extract_jpg = 1;
+ else if (!strcmp(argv[i], "-no-raw"))
+ extract_raw = 0, file_type = NONE;
else if (!strcmp(argv[i], "-raw"))
extract_raw = 1, file_type = RAW;
else if (!strcmp(argv[i], "-tiff"))

No commit comments for this range

Something went wrong with that request. Please try again.