geoblend superceded by dem_mosaic

oleg-alexandrov · Oct 1, 2014 · 03382f6 · 03382f6
1 parent c495288
commit 03382f6
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 47 deletions.
diff --git a/docs/workbook/tools.tex b/docs/workbook/tools.tex
@@ -108,33 +108,33 @@ \section{{\tt hillshade}}\label{sec:hillshade}
 \end{longtable}
 
 
-\section{{\tt geoblend}}\label{sec:geoblend}
-
-\verb#geoblend# merges multiple DEMs into one large DEM.  By default, it blends the DEMs so that the output is smooth at the boundaries.  Disable this feature using the \verb#--draft# flag.  Other options are listed in Table~\ref{tbl:geoblend}.
-
-\begin{longtable}{|l|p{9cm}|} 
-\caption{Command-line options for geoblend}
-\label{tbl:geoblend}
-\endfirsthead
-\endhead
-\endfoot
-\endlastfoot
-\hline
-Option & Description \\ \hline \hline
-\verb#--help# & Display a help message \\ \hline
-\verb#-o [ --mosaic-name ] arg (=mosaic)# & Specify base output directory\\ \hline
-\verb#-t [ --output-file-type ] arg (=tif)# & Output file type\\ \hline
-\verb#--tile-output# & Output the leaf tiles of a quadtree, instead of a single blended image.\\ \hline
-\verb#--tiled-tiff arg (=0)# & Output a tiled TIFF image, with given tile size (0 disables, TIFF only)\\ \hline
-\verb#--patch-size arg (=256)# & Patch size for tiled output, in pixels\\ \hline
-\verb#--patch-overlap arg (=0)# & Patch overlap for tiled output, in pixels\\ \hline
-\verb#--cache arg (=1024)# & Cache size, in megabytes\\ \hline
-\verb#--draft# & Draft mode (no blending)\\ \hline
-\verb#--ignore-alpha# & Ignore the alpha channel of the input images, and don't write an alpha channel in output.\\ \hline
-\verb#--nodata-value arg# & Pixel value to use for nodata in input and output (when there's no alpha channel)\\ \hline
-\verb#--channel-type arg# & Images' channel type. One of [uint8, uint16, int16, float].\\ \hline
-\verb#--verbose# & Verbose output\\ \hline
-\end{longtable}
+% \section{{\tt geoblend}}\label{sec:geoblend}
+
+% \verb#geoblend# merges multiple DEMs into one large DEM.  By default, it blends the DEMs so that the output is smooth at the boundaries.  Disable this feature using the \verb#--draft# flag.  Other options are listed in Table~\ref{tbl:geoblend}.
+
+% \begin{longtable}{|l|p{9cm}|} 
+% \caption{Command-line options for geoblend}
+% \label{tbl:geoblend}
+% \endfirsthead
+% \endhead
+% \endfoot
+% \endlastfoot
+% \hline
+% Option & Description \\ \hline \hline
+% \verb#--help# & Display a help message \\ \hline
+% \verb#-o [ --mosaic-name ] arg (=mosaic)# & Specify base output directory\\ \hline
+% \verb#-t [ --output-file-type ] arg (=tif)# & Output file type\\ \hline
+% \verb#--tile-output# & Output the leaf tiles of a quadtree, instead of a single blended image.\\ \hline
+% \verb#--tiled-tiff arg (=0)# & Output a tiled TIFF image, with given tile size (0 disables, TIFF only)\\ \hline
+% \verb#--patch-size arg (=256)# & Patch size for tiled output, in pixels\\ \hline
+% \verb#--patch-overlap arg (=0)# & Patch overlap for tiled output, in pixels\\ \hline
+% \verb#--cache arg (=1024)# & Cache size, in megabytes\\ \hline
+% \verb#--draft# & Draft mode (no blending)\\ \hline
+% \verb#--ignore-alpha# & Ignore the alpha channel of the input images, and don't write an alpha channel in output.\\ \hline
+% \verb#--nodata-value arg# & Pixel value to use for nodata in input and output (when there's no alpha channel)\\ \hline
+% \verb#--channel-type arg# & Images' channel type. One of [uint8, uint16, int16, float].\\ \hline
+% \verb#--verbose# & Verbose output\\ \hline
+% \end{longtable}
 
 
 \section{{\tt georef}}\label{sec:georef}

diff --git a/src/vw/tools/geoblend.cc → graveyard/geoblend.cc b/src/vw/tools/geoblend.cc → graveyard/geoblend.cc
diff --git a/src/vw/tools/geoblend.h → graveyard/geoblend.h b/src/vw/tools/geoblend.h → graveyard/geoblend.h
diff --git a/src/vw/tools/geoblend_help.cc → graveyard/geoblend_help.cc b/src/vw/tools/geoblend_help.cc → graveyard/geoblend_help.cc
diff --git a/src/vw/tools/Makefile.am b/src/vw/tools/Makefile.am
@@ -109,7 +109,7 @@ endif
 if MAKE_MODULE_CARTOGRAPHY
 if MAKE_MODULE_MOSAIC
 if HAVE_PKG_GDAL
-cart_mos_progs = image2qtree geoblend image2toast
+cart_mos_progs = image2qtree image2toast
 
 # Generates a quadtree of some sort from a georeferenced image
 image2qtree_SOURCES = image2qtree.cc
@@ -138,25 +138,6 @@ libimage2qtree_rgbai16_a_CPPFLAGS = $(AM_CPPFLAGS) -DPIXEL_TYPE=PixelRGBA -DCHAN
 libimage2qtree_rgbaf32_a_SOURCES = image2qtree_help.cc
 libimage2qtree_rgbaf32_a_CPPFLAGS = $(AM_CPPFLAGS) -DPIXEL_TYPE=PixelRGBA -DCHANNEL_TYPE=float32
 
-
-# Creates a blended composite from multiple georeferenced images
-geoblend_SOURCES = geoblend.cc
-geoblend_ARCHIVES = libgeoblend_gray.a libgeoblend_graya.a     \
-        libgeoblend_rgb.a  libgeoblend_rgba.a
-geoblend_LDADD = $(geoblend_ARCHIVES) @PKG_CARTOGRAPHY_LIBS@   \
-        @PKG_MOSAIC_LIBS@ $(COMMON_LIBS)
-# The many archive files are to help speed compile times and to lower
-# the overall memory requirement during compiling.
-noinst_LIBRARIES += $(geoblend_ARCHIVES)
-libgeoblend_gray_a_SOURCES = geoblend_help.cc
-libgeoblend_gray_a_CPPFLAGS = $(AM_CPPFLAGS) -DPIXEL_TYPE=PixelGray
-libgeoblend_graya_a_SOURCES = geoblend_help.cc
-libgeoblend_graya_a_CPPFLAGS = $(AM_CPPFLAGS) -DPIXEL_TYPE=PixelGrayA
-libgeoblend_rgb_a_SOURCES = geoblend_help.cc
-libgeoblend_rgb_a_CPPFLAGS = $(AM_CPPFLAGS) -DPIXEL_TYPE=PixelRGB
-libgeoblend_rgba_a_SOURCES = geoblend_help.cc
-libgeoblend_rgba_a_CPPFLAGS = $(AM_CPPFLAGS) -DPIXEL_TYPE=PixelRGBA
-
 # Creates a TOAST quadtree from multiple georeferenced images
 image2toast_SOURCES = image2toast.cc
 image2toast_LDADD = @PKG_CARTOGRAPHY_LIBS@ @PKG_MOSAIC_LIBS@ $(COMMON_LIBS)