Skip to content

Commit

Permalink
Merged revisions 1590,1603-1605,1609-1615 via svnmerge from
Browse files Browse the repository at this point in the history 
https://babelfish.arc.nasa.gov/svn/visionworkbench/trunk

........
  r1590 | zmoratto | 2009-02-20 23:56:22 -0800 (Fri, 20 Feb 2009) | 6 lines
  
  Updated report, includes triangulation error (min,max,mean,stddev). Switched over to 
  using a pointer for control network. This might be a mistake, I'm just envisioning 
  bundle adjustment throwing out points as it works. I also fixed a bug that sticks 
  the reporting level at 10.
........
  r1603 | mdh | 2009-02-26 14:14:02 -0800 (Thu, 26 Feb 2009) | 1 line
  
  Make KML minLodPixels respect the actual tile resolution.
........
  r1604 | mdh | 2009-02-26 23:24:00 -0800 (Thu, 26 Feb 2009) | 1 line
  
  Fix the broken PNG header reading code.
........
  r1605 | rsargent | 2009-03-03 17:37:10 -0800 (Tue, 03 Mar 2009) | 1 line
  
  Implemented Task::join() and Task::is_finished()
........
  r1609 | mlundy | 2009-03-04 18:00:44 -0800 (Wed, 04 Mar 2009) | 1 line
  
  make some implicit deps explicit
........
  r1610 | mlundy | 2009-03-05 00:47:05 -0800 (Thu, 05 Mar 2009) | 4 lines
  
  remove libvw.la from PKG_VW_LIBS.
  
  it's a convenience library for out-of-tree users. if in-tree libraries
  link against it, we create multi-path problems.
........
  r1611 | mlundy | 2009-03-05 00:47:11 -0800 (Thu, 05 Mar 2009) | 1 line
  
  make automake notice undefined AX_* macros
........
  r1612 | mlundy | 2009-03-05 00:47:16 -0800 (Thu, 05 Mar 2009) | 3 lines
  
  install config.h as a standard header
  
  otherwise, it's installed +x and isn't uninstalled
........
  r1613 | mdh | 2009-03-05 10:33:22 -0800 (Thu, 05 Mar 2009) | 4 lines
  
  Test that a copy of a DiskImageView will still work even after the
  original has gone out of scope.  Fix a crash bug in BlockRasterizeView
  to make the test pass.
........
  r1614 | mdh | 2009-03-05 10:40:27 -0800 (Thu, 05 Mar 2009) | 3 lines
  
  Make a bunch of type conversions explicit, and similar things, to
  eliminate warnings with 4.1.2 on RedHat.
........
  r1615 | mlundy | 2009-03-05 11:57:19 -0800 (Thu, 05 Mar 2009) | 1 line
  
  make sample program work better out of the box.
........
  • Loading branch information
@novas0x2a
novas0x2a committed Mar 5, 2009
2 parents b310d19 + 1431bbf commit 1cbc97c
Show file tree
Hide file tree
Showing 15 changed files with 326 additions and 138 deletions.
4 changes: 0 additions & 4 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ EXTRA_DIST = config/rules.mak config.options.example NOTES docs \
# special top-level rules
########################################################################

install-data-hook:
mkdir -p $(DESTDIR)$(prefix)/include/vw/
$(INSTALL) src/vw/config.h $(DESTDIR)$(prefix)/include/vw/

dist-hook:
rm -rf `find $(distdir) -name '.svn'`
if DIST_LICENSE
Expand Down
53 changes: 35 additions & 18 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ dnl the Administrator of the National Aeronautics and Space Administration.
dnl All Rights Reserved.
dnl __END_LICENSE__

m4_pattern_forbid([^AX_])
m4_pattern_allow([AX_CFLAGS])
m4_pattern_allow([AX_INCLUDE_DIR])
m4_pattern_allow([AX_LIBDIR])
m4_pattern_allow([AX_OTHER_LIBDIR])

##################################################
# A few starting bits
Expand Down Expand Up @@ -200,15 +205,15 @@ AX_PKG_ONE_OF(LAPACK,
AX_PKG(M, [], [-lm], [math.h])
AX_PKG(Z, [], [-lz], [zlib.h])

AX_PKG(PNG, [], [-lpng], [png.h])
AX_PKG(PNG, [Z], [-lpng], [png.h])
AX_PKG(JPEG, [], [-ljpeg], [stdio.h jpeglib.h]) # jpeglib.h requires stdio.h to have been included

AX_PKG(ILMBASE, [Z PTHREADS], [-lImath -lHalf -lIex], [Iex.h], [OpenEXR])
AX_PKG(ILMBASE, [M Z PTHREADS], [-lImath -lHalf -lIex], [Iex.h], [OpenEXR])
AX_PKG(OPENEXR, [ILMBASE], [-lIlmImf], [ImfOutputFile.h], [OpenEXR])

AX_PKG_ONE_OF(HDF,
HDF_PLAIN, [AX_PKG(HDF_PLAIN, [], [-ldf -lmfhdf], [mfhdf.h] )],
HDF_SUBDIR, [AX_PKG(HDF_SUBDIR, [], [-ldf -lmfhdf], [mfhdf.h], [hdf])]
HDF_PLAIN, [AX_PKG(HDF_PLAIN, [M JPEG], [-ldf -lmfhdf], [mfhdf.h] )],
HDF_SUBDIR, [AX_PKG(HDF_SUBDIR, [M JPEG], [-ldf -lmfhdf], [mfhdf.h], [hdf])]
)

AX_PKG_ONE_OF(GL,
Expand All @@ -232,7 +237,7 @@ fi
AX_PKG(TIFF, [], [-ltiff], [tiff.h])
PKG_CHECK_FUNCTION(TIFF, [TIFFScanlineSize64], [BigTIFF])

AX_PKG(PROJ4, [], [-lproj], [projects.h])
AX_PKG(PROJ4, [M], [-lproj], [projects.h])

dnl # Qt with AutoTroll.
dnl AT_WITH_QT([+gui +sql +opengl], [], [], [], [HAVE_PKG_QT_INCLUDE="no:missing QT"])
Expand Down Expand Up @@ -269,26 +274,38 @@ AM_CONDITIONAL(HAVE_PKG_GDAL, [test "$HAVE_PKG_GDAL" = "yes"])
# module definitions
##################################################

AX_MODULE(CORE, [src/vw/Core], [libvwCore.la], yes, [], [BOOST THREADS M], [PTHREADS])
AX_MODULE(MATH, [src/vw/Math], [libvwMath.la], yes, [CORE], [], [LAPACK])
AX_MODULE(IMAGE, [src/vw/Image], [libvwImage.la], yes, [MATH])
AX_MODULE(FILEIO, [src/vw/FileIO], [libvwFileIO.la], yes, [IMAGE], [], [Z PNG JPEG TIFF OPENEXR HDF GDAL])
AX_MODULE(VW, [src/vw], [libvw.la], yes, [], [CORE MATH IMAGE], [FILEIO])
AX_MODULE(CORE, [src/vw/Core], [libvwCore.la], yes, [], [BOOST THREADS M], [PTHREADS])
AX_MODULE(MATH, [src/vw/Math], [libvwMath.la], yes, [CORE], [], [LAPACK])
AX_MODULE(IMAGE, [src/vw/Image], [libvwImage.la], yes, [MATH])
AX_MODULE(FILEIO, [src/vw/FileIO], [libvwFileIO.la], yes, [IMAGE], [], [Z PNG JPEG TIFF OPENEXR HDF GDAL])
AX_MODULE(VW, [src/vw], [libvw.la], yes, [], [CORE MATH IMAGE], [FILEIO])

if test "${MAKE_MODULE_VW}" != "yes"; then
AC_MSG_ERROR([cannot build the Vision Workbench core modules!])
fi

AX_MODULE(CAMERA, [src/vw/Camera], [libvwCamera.la], yes, [VW])
AX_MODULE(MOSAIC, [src/vw/Mosaic], [libvwMosaic.la], yes, [VW])
# remove libvw.la from this. it's a convenience library that just happens to be
# installed, but if we link against it, we create multi-path problems
PKG_VW_LIBS_TEMP=
for i in $PKG_VW_LIBS; do
case $i in
*libvw\.*) ;;
*) PKG_VW_LIBS_TEMP="$PKG_VW_LIBS_TEMP $i" ;;
esac
done
PKG_VW_LIBS="$PKG_VW_LIBS_TEMP"

AX_MODULE(CAMERA, [src/vw/Camera], [libvwCamera.la], yes, [VW])
AX_MODULE(MOSAIC, [src/vw/Mosaic], [libvwMosaic.la], yes, [VW])
AX_MODULE(INTERESTPOINT, [src/vw/InterestPoint], [libvwInterestPoint.la], yes, [VW])
AX_MODULE(CARTOGRAPHY, [src/vw/Cartography], [libvwCartography.la], yes, [VW], [PROJ4], [GDAL])
AX_MODULE(HDR, [src/vw/HDR], [libvwHDR.la], yes, [VW], [CAMERA LAPACK])
AX_MODULE(STEREO, [src/vw/Stereo], [libvwStereo.la], yes, [VW], [])
AX_MODULE(GEOMETRY, [src/vw/Geometry], [libvwGeometry.la], yes, [VW], [], [])
AX_MODULE(CARTOGRAPHY, [src/vw/Cartography], [libvwCartography.la], yes, [VW], [PROJ4], [GDAL])
AX_MODULE(HDR, [src/vw/HDR], [libvwHDR.la], yes, [VW], [CAMERA LAPACK])
AX_MODULE(STEREO, [src/vw/Stereo], [libvwStereo.la], yes, [VW])
AX_MODULE(GEOMETRY, [src/vw/Geometry], [libvwGeometry.la], yes, [VW])
if test $host_vendor = apple; then
AX_MODULE(GPU, [src/vw/GPU], [libvwGPU.la], no, [VW], [GL], [CG])
AX_MODULE(GPU, [src/vw/GPU], [libvwGPU.la], no, [VW], [GL], [CG])
else
AX_MODULE(GPU, [src/vw/GPU], [libvwGPU.la], no, [VW], [GL GLEW], [CG])
AX_MODULE(GPU, [src/vw/GPU], [libvwGPU.la], no, [VW], [GL GLEW], [CG])
fi


Expand Down
2 changes: 1 addition & 1 deletion docs/workbook/vwconvert.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
int main( int argc, char *argv[] ) {
try {
VW_ASSERT( argc==3, vw::ArgumentErr() << "Invalid command-line args." );
vw::ImageView<float> image;
vw::ImageView<vw::PixelRGBA<float> > image;
read_image( image, argv[1] );
write_image( argv[2], image );
}
Expand Down
Loading

0 comments on commit 1cbc97c

Please sign in to comment.