@@ -50,9 +50,9 @@ char const help_message [] = /* ----------------------------------------------------------------- */ /* long options codes */ -enum { +enum { opt_meta = 1000, - opt_frames, + opt_frames, opt_descriptors, opt_gss, opt_first_octave, @@ -106,51 +106,51 @@ save_gss (VlSiftFilt * filt, VlFileMeta * fm, const char * basename, if (! fm -> active) { return VL_ERR_OK ; } - + w = vl_sift_get_octave_width (filt) ; h = vl_sift_get_octave_height (filt) ; - + pim.width = w ; pim.height = h ; pim.max_value = 255 ; pim.is_raw = 1 ; - + buffer = malloc (sizeof(vl_uint8) * w * h) ; if (! buffer) { err = VL_ERR_ALLOC ; goto save_gss_quit ; } - + q = vl_string_copy (tmp, sizeof(tmp), basename) ; if (q >= sizeof(tmp)) { err = VL_ERR_OVERFLOW ; goto save_gss_quit ; } - + for (s = 0 ; s < S ; ++s) { vl_sift_pix * pt = vl_sift_get_octave (filt, s) ; - + /* conversion */ for (i = 0 ; i < w * h ; ++i) { buffer [i] = (vl_uint8) pt [i] ; } - + /* save */ snprintf(tmp + q, sizeof(tmp) - q, "_%02d_%03d", o, s) ; err = vl_file_meta_open (fm, tmp, "wb") ; - if (err) goto save_gss_quit ; - + if (err) goto save_gss_quit ; + err = vl_pgm_insert (fm -> file, &pim, buffer) ; if (err) goto save_gss_quit ; if (verbose) { printf("sift: saved gss level to '%s'\n", fm -> name) ; } - + vl_file_meta_close (fm) ; } - + save_gss_quit : ; if (buffer) free (buffer) ; vl_file_meta_close (fm) ; @@ -170,15 +170,15 @@ korder (void const* a, void const* b) { } /* ---------------------------------------------------------------- */ -/** @brief SIFT driver entry point +/** @brief SIFT driver entry point **/ int main(int argc, char **argv) -{ - /* algorithm parameters */ - double edge_thresh = -1 ; - double peak_thresh = -1 ; - double magnif = -1 ; +{ + /* algorithm parameters */ + double edge_thresh = -1 ; + double peak_thresh = -1 ; + double magnif = -1 ; int O = -1, S = 3, omin = -1 ; vl_bool err = VL_ERR_OK ; @@ -195,13 +195,13 @@ main(int argc, char **argv) VlFileMeta met = {0, "%.meta", VL_PROT_ASCII, "", 0} ; VlFileMeta gss = {0, "%.pgm", VL_PROT_ASCII, "", 0} ; VlFileMeta ifr = {0, "%.frame", VL_PROT_ASCII, "", 0} ; - + #define ERR(msg, arg) { \ err = VL_ERR_BAD_ARG ; \ snprintf(err_msg, sizeof(err_msg), msg, arg) ; \ break ; \ } - + /* ----------------------------------------------------------------- * Parse options * -------------------------------------------------------------- */ @@ -222,13 +222,13 @@ main(int argc, char **argv) /* unkown option ............................................ */ ERR("Invalid option '%s'.", argv [optind - 1]) ; break ; - + case ':' : /* missing argument ......................................... */ - ERR("Missing mandatory argument for option '%s'.", + ERR("Missing mandatory argument for option '%s'.", argv [optind - 1]) ; break ; - + case 'h' : /* --help ................................................... */ printf (help_message, argv [0]) ; @@ -238,7 +238,7 @@ main(int argc, char **argv) printf ("Meta filespec: `%s'\n", met.pattern) ; printf ("GSS filespec: '%s'\n", gss.pattern) ; printf ("Read frames filespec: '%s'\n", ifr.pattern) ; - printf ("Version: driver %s; libvl %s\n", + printf ("Version: driver %s; libvl %s\n", VL_XSTRINGIFY(VL_SIFT_DRIVER_VERSION), vl_get_version_string()) ; exit (0) ; @@ -252,7 +252,7 @@ main(int argc, char **argv) case 'o' : /* --output ................................................ */ err = vl_file_meta_parse (&out, optarg) ; - if (err) + if (err) ERR("The arguments of '%s' is invalid.", argv [optind - 1]) ; force_output = 1 ; break ; @@ -260,41 +260,41 @@ main(int argc, char **argv) case opt_frames : /* --frames ................................................ */ err = vl_file_meta_parse (&frm, optarg) ; - if (err) + if (err) ERR("The arguments of '%s' is invalid.", argv [optind - 1]) ; break ; case opt_descriptors : /* --descriptor ............................................. */ err = vl_file_meta_parse (&dsc, optarg) ; - if (err) + if (err) ERR("The arguments of '%s' is invalid.", argv [optind - 1]) ; break; - + case opt_meta : /* --meta ................................................... */ - err = vl_file_meta_parse (&met, optarg) ; - if (err) + err = vl_file_meta_parse (&met, optarg) ; + if (err) ERR("The arguments of '%s' is invalid.", argv [optind - 1]) ; - + if (met.protocol != VL_PROT_ASCII) ERR("meta file supports only ASCII protocol", argv[optind - 1]) ; break ; case opt_read_frames : /* --read_frames ............................................ */ - err = vl_file_meta_parse (&ifr, optarg) ; - if (err) - ERR("The arguments of '%s' is invalid.", argv [optind - 1]) ; + err = vl_file_meta_parse (&ifr, optarg) ; + if (err) + ERR("The arguments of '%s' is invalid.", argv [optind - 1]) ; break ; case opt_gss : /* --gss .................................................... */ err = vl_file_meta_parse (&gss, optarg) ; - if (err) + if (err) ERR("The arguments of '%s' is invalid.", argv [optind - 1]) ; break ; - + case 'O' : @@ -304,7 +304,7 @@ main(int argc, char **argv) ERR("The argument of '%s' must be a non-negative integer.", argv [optind - 1]) ; break ; - + case 'S' : /* --levels ............................................... */ n = sscanf (optarg, "%d", &S) ; @@ -316,11 +316,11 @@ main(int argc, char **argv) case opt_first_octave : /* --first-octave ......................................... */ n = sscanf (optarg, "%d", &omin) ; - if (n == 0 || omin < 0) - ERR("The argument of '%s' must be a non-negative integer.", + if (n == 0) + ERR("The argument of '%s' must be an integer.", argv [optind - 1]) ; break ; - + case opt_edge_thresh : @@ -343,7 +343,7 @@ main(int argc, char **argv) /* --magnif .............................................. */ n = sscanf (optarg, "%lf", &magnif) ; if (n == 0 || magnif < 1) - ERR("The argument of '%s' must ve a non-negative float.", + ERR("The argument of '%s' must be a non-negative float.", argv [optind - 1]) ; break ; @@ -352,19 +352,19 @@ main(int argc, char **argv) /* --orientations ......................................... */ force_orientations = 1 ; break ; - + case 0 : default : /* should not get here ...................................... */ assert (0) ; break ; } - } - + } + /* check for parsing errors */ if (err) { - fprintf(stderr, "%s: error: %s (%d)\n", - argv [0], + fprintf(stderr, "%s: error: %s (%d)\n", + argv [0], err_msg, err) ; exit (1) ; } @@ -372,8 +372,8 @@ main(int argc, char **argv) /* parse other arguments (filenames) */ argc -= optind ; argv += optind ; - - /* + + /* if --output is not specified, specifying --frames or --descriptors prevent the aggregate outout file to be produced. */ @@ -387,22 +387,22 @@ main(int argc, char **argv) printf("%3s ", (fm).active ? "yes" : "no") ; \ printf("%-6s ", vl_string_protocol_name ((fm).protocol)) ; \ printf("%-10s\n", (fm).pattern) ; - + PRNFO("write aggregate . ", out) ; PRNFO("write frames .... ", frm) ; PRNFO("write descriptors ", dsc) ; PRNFO("write meta ...... ", met) ; PRNFO("write GSS ....... ", gss) ; PRNFO("read frames .... ", ifr) ; - + if (force_orientations) printf("sift: will compute orientations\n") ; } - + /* ------------------------------------------------------------------ * Process one image per time * --------------------------------------------------------------- */ - + while (argc--) { char basename [1024] ; @@ -419,27 +419,27 @@ main(int argc, char **argv) double *ikeys = 0 ; int nikeys = 0, ikeys_size = 0 ; - + /* ............................................................... * Determine files * ............................................................ */ - + /* get basenmae from filename */ q = vl_string_basename (basename, sizeof(basename), name, 1) ; - + err = (q >= sizeof(basename)) ; if (err) { - snprintf(err_msg, sizeof(err_msg), + snprintf(err_msg, sizeof(err_msg), "Basename of '%s' is too long", name); err = VL_ERR_OVERFLOW ; goto done ; } - + if (verbose) { printf ("sift: <== '%s'\n", name) ; } - + if (verbose > 1) { printf ("sift: basename is '%s'\n", basename) ; } @@ -448,11 +448,11 @@ main(int argc, char **argv) in = fopen (name, "rb") ; if (!in) { err = VL_ERR_IO ; - snprintf(err_msg, sizeof(err_msg), + snprintf(err_msg, sizeof(err_msg), "Could not open '%s' for reading.", name) ; goto done ; } - + /* ............................................................... * Read data * ............................................................ */ @@ -463,37 +463,37 @@ main(int argc, char **argv) if (err) { switch (vl_err_no) { case VL_ERR_PGM_IO : - snprintf(err_msg, sizeof(err_msg), + snprintf(err_msg, sizeof(err_msg), "Cannot read from '%s'.", name) ; err = VL_ERR_IO ; break ; case VL_ERR_PGM_INV_HEAD : - snprintf(err_msg, sizeof(err_msg), + snprintf(err_msg, sizeof(err_msg), "'%s' contains a malformed PGM header.", name) ; err = VL_ERR_IO ; goto done ; } } - + if (verbose) printf ("sift: image is %d by %d pixels\n", pim. width, pim. height) ; - + /* allocate buffer */ - data = malloc(vl_pgm_get_npixels (&pim) * + data = malloc(vl_pgm_get_npixels (&pim) * vl_pgm_get_bpp (&pim) * sizeof (vl_uint8) ) ; - fdata = malloc(vl_pgm_get_npixels (&pim) * + fdata = malloc(vl_pgm_get_npixels (&pim) * vl_pgm_get_bpp (&pim) * sizeof (vl_sift_pix)) ; - + if (!data || !fdata) { err = VL_ERR_ALLOC ; - snprintf(err_msg, sizeof(err_msg), + snprintf(err_msg, sizeof(err_msg), "Could not allocate enough memory.") ; goto done ; - } - + } + /* read PGM body */ err = vl_pgm_extract_data (in, &pim, data) ; @@ -506,7 +506,7 @@ main(int argc, char **argv) /* convert data type */ for (q = 0 ; q < pim.width * pim.height ; ++q) fdata [q] = data [q] ; - + /* ............................................................... * Optionally source keypoints * ............................................................ */ @@ -521,11 +521,11 @@ main(int argc, char **argv) "Could not open '%s' for " #op, name) ; \ goto done ; \ } - + if (ifr.active) { - + /* open file */ - err = vl_file_meta_open (&ifr, basename, "rb") ; + err = vl_file_meta_open (&ifr, basename, "rb") ; WERR(ifr.name, reading) ; #define QERR \ @@ -535,20 +535,20 @@ main(int argc, char **argv) err = VL_ERR_IO ; \ goto done ; \ } - + while (1) { double x, y, s, th ; /* read next guy */ err = vl_file_meta_get_double (&ifr, &x) ; if (err == VL_ERR_EOF) break; - else QERR ; + else QERR ; err = vl_file_meta_get_double (&ifr, &y ) ; QERR ; err = vl_file_meta_get_double (&ifr, &s ) ; QERR ; err = vl_file_meta_get_double (&ifr, &th) ; if (err == VL_ERR_EOF) break; else QERR ; - + /* make enough space */ if (ikeys_size < nikeys + 1) { ikeys_size += 10000 ; @@ -566,7 +566,7 @@ main(int argc, char **argv) /* now order by scale */ qsort (ikeys, nikeys, 4 * sizeof(double), korder) ; - + if (verbose) { printf ("sift: read %d keypoints from '%s'\n", nikeys, ifr.name) ; } @@ -578,19 +578,19 @@ main(int argc, char **argv) /* ............................................................... * Open output files * ............................................................ */ - + err = vl_file_meta_open (&out, basename, "wb") ; WERR(out.name, writing) ; err = vl_file_meta_open (&dsc, basename, "wb") ; WERR(dsc.name, writing) ; - err = vl_file_meta_open (&frm, basename, "wb") ; WERR(frm.name, writing) ; + err = vl_file_meta_open (&frm, basename, "wb") ; WERR(frm.name, writing) ; err = vl_file_meta_open (&met, basename, "wb") ; WERR(met.name, writing) ; if (verbose > 1) { - if (out.active) printf("sift: writing all ....... to . '%s'\n", out.name); - if (frm.active) printf("sift: writing frames .... to . '%s'\n", frm.name); - if (dsc.active) printf("sift: writing descriptors to . '%s'\n", dsc.name); + if (out.active) printf("sift: writing all ....... to . '%s'\n", out.name); + if (frm.active) printf("sift: writing frames .... to . '%s'\n", frm.name); + if (dsc.active) printf("sift: writing descriptors to . '%s'\n", dsc.name); if (met.active) printf("sift: writign meta ...... to . '%s'\n", met.name); } - + /* ............................................................... * Make filter * ............................................................ */ @@ -602,19 +602,19 @@ main(int argc, char **argv) if (magnif >= 0) vl_sift_set_magnif (filt, magnif) ; if (!filt) { - snprintf (err_msg, sizeof(err_msg), + snprintf (err_msg, sizeof(err_msg), "Could not create SIFT filter.") ; err = VL_ERR_ALLOC ; goto done ; } - if (verbose > 1) { + if (verbose > 1) { printf ("sift: filter settings:\n") ; - printf ("sift: octaves (O) = %d\n", + printf ("sift: octaves (O) = %d\n", vl_sift_get_noctaves (filt)) ; printf ("sift: levels (S) = %d\n", vl_sift_get_nlevels (filt)) ; - printf ("sift: first octave (o_min) = %d\n", + printf ("sift: first octave (o_min) = %d\n", vl_sift_get_octave_first (filt)) ; printf ("sift: edge thresh = %g\n", vl_sift_get_edge_thresh (filt)) ; @@ -625,7 +625,7 @@ main(int argc, char **argv) printf ("sift: will source frames? %s\n", ikeys ? "yes" : "no") ; printf ("sift: will force orientations? %s\n", - force_orientations ? "yes" : "no") ; + force_orientations ? "yes" : "no") ; } /* ............................................................... @@ -636,7 +636,7 @@ main(int argc, char **argv) while (1) { VlSiftKeypoint const *keys ; int nkeys ; - + /* calculate the GSS for the next octave .................... */ if (first) { first = 0 ; @@ -644,7 +644,7 @@ main(int argc, char **argv) } else { err = vl_sift_process_next_octave (filt) ; } - + if (err) { err = VL_ERR_OK ; break ; @@ -668,11 +668,11 @@ main(int argc, char **argv) /* run detector ............................................. */ if (ikeys == 0) { vl_sift_detect (filt) ; - + keys = vl_sift_get_keypoints (filt) ; nkeys = vl_sift_get_nkeypoints (filt) ; i = 0 ; - + if (verbose > 1) { printf ("sift: detected %d (unoriented) keypoints\n", nkeys) ; } @@ -689,28 +689,28 @@ main(int argc, char **argv) /* obtain keypoint orientations ........................... */ if (ikeys) { - vl_sift_keypoint_init (filt, &ik, + vl_sift_keypoint_init (filt, &ik, ikeys [4 * i + 0], ikeys [4 * i + 1], ikeys [4 * i + 2]) ; - + if (ik.o != vl_sift_get_octave_index (filt)) { break ; } - + k = &ik ; - + /* optionally compute orientations too */ if (force_orientations) { - nangles = vl_sift_calc_keypoint_orientations - (filt, angles, k) ; + nangles = vl_sift_calc_keypoint_orientations + (filt, angles, k) ; } else { angles [0] = ikeys [4 * i + 3] ; nangles = 1 ; } } else { k = keys + i ; - nangles = vl_sift_calc_keypoint_orientations + nangles = vl_sift_calc_keypoint_orientations (filt, angles, k) ; } @@ -720,7 +720,7 @@ main(int argc, char **argv) /* compute descriptor (if necessary) */ if (out.active || dsc.active) { - vl_sift_calc_keypoint_descriptor + vl_sift_calc_keypoint_descriptor (filt, descr, k, angles [q]) ; } @@ -735,7 +735,7 @@ main(int argc, char **argv) } if (out.protocol == VL_PROT_ASCII) fprintf(out.file, "\n") ; } - + if (frm.active) { vl_file_meta_put_double (&frm, k -> x ) ; vl_file_meta_put_double (&frm, k -> y ) ; @@ -760,7 +760,7 @@ main(int argc, char **argv) /* ............................................................... * Finish up * ............................................................ */ - + if (met.active) { fprintf(met.file, "<sift\n") ; fprintf(met.file, " input = '%s'\n", name) ; @@ -772,7 +772,7 @@ main(int argc, char **argv) } fprintf(met.file, ">\n") ; } - + done : /* release input keys buffer */ if (ikeys) { @@ -792,26 +792,26 @@ main(int argc, char **argv) free (fdata) ; fdata = 0 ; } - + /* release image data */ if (data) { free (data) ; data = 0 ; } - + /* close files */ if (in) { fclose (in) ; in = 0 ; } - + vl_file_meta_close (&out) ; vl_file_meta_close (&frm) ; vl_file_meta_close (&dsc) ; vl_file_meta_close (&met) ; vl_file_meta_close (&gss) ; vl_file_meta_close (&ifr) ; - + /* if bad print error message */ if (err) { fprintf @@ -822,7 +822,7 @@ main(int argc, char **argv) exit_code = 1 ; } } - + /* quit */ return exit_code ; } src/sift.c @@ -19,7 +19,7 @@ vl_demo_print('sift_basic_0') ; % -------------------------------------------------------------------- I = single(rgb2gray(I)) ; -clf ; imagesc(I) +clf ; imagesc(I) axis equal ; axis off ; axis tight ; vl_demo_print('sift_basic_1') ; @@ -29,7 +29,7 @@ vl_demo_print('sift_basic_1') ; [f,d] = vl_sift(I) ; hold on ; -perm = randperm(size(f,2)) ; +perm = randperm(size(f,2)) ; sel = perm(1:50) ; h1 = vl_plotframe(f(:,sel)) ; set(h1,'color','k','linewidth',3) ; h2 = vl_plotframe(f(:,sel)) ; set(h2,'color','y','linewidth',2) ; @@ -50,7 +50,7 @@ vl_demo_print('sift_basic_3') ; % -------------------------------------------------------------------- % Custom keypoint % -------------------------------------------------------------------- -clf ; imagesc(I(1:200,1:200,:)) +clf ; imagesc(I(1:200,1:200,:)) axis equal ; axis off ; axis tight ; hold on; toolbox/demo/vl_demo_sift_basic.m @@ -20,7 +20,7 @@ I = single(I) ; % -------------------------------------------------------------------- [err,msg] = vl_demo_cmd('sift',['"' p_img '" --output=ascii://"' p_txt ... - '" --peak-thresh=3.4 --edge-thresh=10']) ; + '" --peak-thresh=3.4 --edge-thresh=10 --first-octave=-1']) ; if (err), error(msg) ; end data = load(p_txt,'-ASCII') ; toolbox/demo/vl_demo_sift_cmd.m 4287d27895aa4634afa511bf7f2e8fc66b7d1e37 Andrea Vedaldi vedaldi@gmail.com http://github.com/vlfeat/vlfeat/commit/c94b0c6cdff5a0b7dba109dc36be73e2c7528feb c94b0c6cdff5a0b7dba109dc36be73e2c7528feb 2009-08-27T15:35:31-07:00 2009-08-27T15:35:31-07:00 src/sift: fixes a bug preventing sift from accepting a negative value for the --first-octave option d5af26bcbb264552f6e9a774ff8cbbed65672abb Andrea Vedaldi vedaldi@gmail.com