Menu
▾
▴
[Ravl-commits] CVS: Ravl/Image/VideoIO RavlVidIO.cc,NONE,1.1 CifFormat.cc,1.3,1.4 CifFormat.hh,1.4,1.5 ImgIOCif.cc,1.5,1.6 ImgIOCif.hh,1.3,1.4 ImgIOrgb.cc,1.5,1.6 ImgIOrgb.hh,1.4,1.5 ImgIOyuv.cc,1.4,1.5 ImgIOyuv.hh,1.4,1.5 defs.mk,1.3,1.4 exImgSeq.cc,1.1.1.1,1.2 rawFormat.cc,1.3,1.4 rawFormat.hh,1.4,1.5 rgbFormat.cc,1.3,1.4 rgbFormat.hh,1.4,1.5 syuvFormat.cc,1.3,1.4 syuvFormat.hh,1.4,1.5 yuvFormat.cc,1.3,1.4 yuvFormat.hh,1.4,1.5 VidIO.cc,1.2,NONE
|
From: Charles G. <cr...@us...> - 2001-08-28 13:33:17
|
Update of /cvsroot/ravl/Ravl/Image/VideoIO In directory usw-pr-cvs1:/tmp/cvs-serv18175 Modified Files: CifFormat.cc CifFormat.hh ImgIOCif.cc ImgIOCif.hh ImgIOrgb.cc ImgIOrgb.hh ImgIOyuv.cc ImgIOyuv.hh defs.mk exImgSeq.cc rawFormat.cc rawFormat.hh rgbFormat.cc rgbFormat.hh syuvFormat.cc syuvFormat.hh yuvFormat.cc yuvFormat.hh Added Files: RavlVidIO.cc Removed Files: VidIO.cc Log Message: Fix bug #451180, along with some other fixes. --- NEW FILE --- // This file is part of RAVL, Recognition And Vision Library // Copyright (C) 2001, University of Surrey // This code may be redistributed under the terms of the GNU Lesser // General Public License (LGPL). See the lgpl.licence file for details or // see http://www.gnu.org/copyleft/lesser.html // file-header-ends-here ////////////////////////////////////////////////// //! rcsid="$Id: RavlVidIO.cc,v 1.1 2001/08/28 13:33:14 craftit Exp $" //! lib=RavlVideoIO //#include "Ravl/Image/VidIO.hh" #include "Ravl/Image/ImgIO.hh" namespace RavlImageN { //extern void InitDPImageIO(); extern void InitRawIOFormat(); extern void InitCifFormat(); extern void InitYUVFormat(); extern void InitRGBFormat(); extern void InitSYUVFormat(); void InitVidIO() { //InitDPImageIO(); InitRawIOFormat(); InitCifFormat(); InitYUVFormat(); InitRGBFormat(); InitSYUVFormat(); // InitImgIOComposites(); } } Index: CifFormat.cc =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/CifFormat.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** CifFormat.cc 2001/05/24 22:50:53 1.3 --- CifFormat.cc 2001/08/28 13:33:14 1.4 *************** *** 7,11 **** ////////////////////////////////////////////////// //! rcsid="$Id$" ! //! lib=RavlImage //! file="Ravl/Image/VideoIO/CifFormat.cc" --- 7,11 ---- ////////////////////////////////////////////////// //! rcsid="$Id$" ! //! lib=RavlVideoIO //! file="Ravl/Image/VideoIO/CifFormat.cc" Index: CifFormat.hh =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/CifFormat.hh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** CifFormat.hh 2001/05/24 22:50:53 1.4 --- CifFormat.hh 2001/08/28 13:33:14 1.5 *************** *** 14,18 **** //! file="Ravl/Image/VideoIO/CifFormat.hh" //! example=exImgSeq.cc ! //! lib=RavlImage #include "Ravl/DP/FileFormat.hh" --- 14,18 ---- //! file="Ravl/Image/VideoIO/CifFormat.hh" //! example=exImgSeq.cc ! //! lib=RavlVideoIO #include "Ravl/DP/FileFormat.hh" Index: ImgIOCif.cc =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/ImgIOCif.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** ImgIOCif.cc 2001/07/09 10:24:36 1.5 --- ImgIOCif.cc 2001/08/28 13:33:14 1.6 *************** *** 8,12 **** //! userlevel=Normal //! rcsid="$Id$" ! //! lib=RavlImage //! file="Ravl/Image/VideoIO/ImgIOCif.cc" --- 8,12 ---- //! userlevel=Normal //! rcsid="$Id$" ! //! lib=RavlVideoIO //! file="Ravl/Image/VideoIO/ImgIOCif.cc" Index: ImgIOCif.hh =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/ImgIOCif.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** ImgIOCif.hh 2001/05/24 22:50:53 1.3 --- ImgIOCif.hh 2001/08/28 13:33:14 1.4 *************** *** 10,14 **** //! rcsid="$Id$" //! file="Ravl/Image/VideoIO/ImgIOCif.hh" ! //! lib=RavlImage //! example=exImgSeq.cc //! docentry="Ravl.Images.IO.Formats" --- 10,14 ---- //! rcsid="$Id$" //! file="Ravl/Image/VideoIO/ImgIOCif.hh" ! //! lib=RavlVideoIO //! example=exImgSeq.cc //! docentry="Ravl.Images.IO.Formats" Index: ImgIOrgb.cc =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/ImgIOrgb.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** ImgIOrgb.cc 2001/07/09 10:24:36 1.5 --- ImgIOrgb.cc 2001/08/28 13:33:14 1.6 *************** *** 8,12 **** //! userlevel=Normal //! rcsid="$Id$" ! //! lib=RavlImage //! file="Ravl/Image/VideoIO/ImgIOrgb.cc" --- 8,12 ---- //! userlevel=Normal //! rcsid="$Id$" ! //! lib=RavlVideoIO //! file="Ravl/Image/VideoIO/ImgIOrgb.cc" Index: ImgIOrgb.hh =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/ImgIOrgb.hh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** ImgIOrgb.hh 2001/05/24 22:50:53 1.4 --- ImgIOrgb.hh 2001/08/28 13:33:14 1.5 *************** *** 9,13 **** //////////////////////////////////////////////////// //! file="Ravl/Image/VideoIO/ImgIOrgb.hh" ! //! lib=RavlImage //! docentry="Ravl.Images.IO.Formats" //! example=exImgSeq.cc --- 9,13 ---- //////////////////////////////////////////////////// //! file="Ravl/Image/VideoIO/ImgIOrgb.hh" ! //! lib=RavlVideoIO //! docentry="Ravl.Images.IO.Formats" //! example=exImgSeq.cc Index: ImgIOyuv.cc =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/ImgIOyuv.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** ImgIOyuv.cc 2001/05/24 22:50:53 1.4 --- ImgIOyuv.cc 2001/08/28 13:33:14 1.5 *************** *** 8,12 **** //! userlevel=Normal //! rcsid="$Id$" ! //! lib=RavlImage //! file="Ravl/Image/VideoIO/ImgIOyuv.cc" --- 8,12 ---- //! userlevel=Normal //! rcsid="$Id$" ! //! lib=RavlVideoIO //! file="Ravl/Image/VideoIO/ImgIOyuv.cc" Index: ImgIOyuv.hh =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/ImgIOyuv.hh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** ImgIOyuv.hh 2001/05/24 22:50:53 1.4 --- ImgIOyuv.hh 2001/08/28 13:33:14 1.5 *************** *** 9,13 **** //////////////////////////////////////////////////// //! file="Ravl/Image/VideoIO/ImgIOyuv.hh" ! //! lib=RavlImage //! docentry="Ravl.Images.IO.Formats" //! example=exImgSeq.cc --- 9,13 ---- //////////////////////////////////////////////////// //! file="Ravl/Image/VideoIO/ImgIOyuv.hh" ! //! lib=RavlVideoIO //! docentry="Ravl.Images.IO.Formats" //! example=exImgSeq.cc Index: defs.mk =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/defs.mk,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** defs.mk 2001/05/10 13:44:44 1.3 --- defs.mk 2001/08/28 13:33:14 1.4 *************** *** 27,40 **** ! MUSTLINK = ! # VidIO.cc ! LIBDEPS=RavlVideoIO.def ! PLIB = RavlImage ! #EXAMPLES = exImgSeq.cc ! ! USESLIBS = RavlImage RavlIO RavlOS #PROGLIBS = Mopt --- 27,37 ---- ! MUSTLINK = RavlVidIO.cc ! PLIB = RavlVideoIO ! EXAMPLES = exImgSeq.cc ! USESLIBS = RavlImageIO RavlImage RavlOS RavlIO #PROGLIBS = Mopt Index: exImgSeq.cc =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/exImgSeq.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** exImgSeq.cc 2001/04/23 16:17:52 1.1.1.1 --- exImgSeq.cc 2001/08/28 13:33:14 1.2 *************** *** 1,31 **** //////////////////////////////////////////////////////// //! rcsid="$Id$" ! #include "amma/Option.hh" ! #include "amma/DP/SequenceIO.hh" ! #include "amma/ByteImag.hh" ! #include "amma/Image/VidIO.hh" ! #include "amma/Image/ImgIO.hh" int main(int argc,char **argv) ! { ! // Initalise IO code... ! ! InitDPImageIO(); ! InitVidIO(); ! // Process options. - OptionC option(argc,argv,TRUE); - FilenameC ifilename = option.String("i","","Input stream."); - FilenameC ofilename = option.String("o","out.abs","Output stream."); - StringC ifmt = option.String("if","","Input format. "); - StringC ofmt = option.String("of","","Output format. "); - BooleanT verbose = option.Boolean("v",FALSE,"Verbose mode. \n"); - option.Check(); ! using namespace StdIO; ! DPIPortC<ByteImageC> inputStream; ! DPOPortC<ByteImageC> outputStream; if(!OpenISequence(inputStream,ifilename,ifmt,verbose)) { --- 1,34 ---- + // This file is part of RAVL, Recognition And Vision Library + // Copyright (C) 2001, University of Surrey + // This code may be redistributed under the terms of the GNU Lesser + // General Public License (LGPL). See the lgpl.licence file for details or + // see http://www.gnu.org/copyleft/lesser.html + // file-header-ends-here //////////////////////////////////////////////////////// //! rcsid="$Id$" + //! lib=RavlVideoIO ! #include "Ravl/Option.hh" ! #include "Ravl/DP/SequenceIO.hh" ! #include "Ravl/Image/Image.hh" ! #include "Ravl/Image/ImgIO.hh" + using namespace RavlN; + using namespace RavlImageN; + int main(int argc,char **argv) ! { // Process options. ! OptionC option(argc,argv); ! StringC ifilename = option.String("i","","Input stream."); ! StringC ofilename = option.String("o","out.abs","Output stream."); ! StringC ifmt = option.String("if","","Input format. "); ! StringC ofmt = option.String("of","","Output format. "); ! bool verbose = option.Boolean("v",false,"Verbose mode. "); ! option.Check(); ! DPIPortC<ImageC<ByteT> > inputStream; ! DPOPortC<ImageC<ByteT> > outputStream; if(!OpenISequence(inputStream,ifilename,ifmt,verbose)) { *************** *** 42,46 **** for(;;) { ! ByteImageC buff; if(!inputStream.Get(buff)) // End of stream ? break; --- 45,49 ---- for(;;) { ! ImageC<ByteT> buff; if(!inputStream.Get(buff)) // End of stream ? break; *************** *** 51,59 **** } //////////////////////////////////////////// // Alernate main loop... - #if 0 for(;!inputStream.IsGetEOS();) { // Is End Of Stream ? ! ByteImageC buff = inputStream.Get(); if(!outputStream.Put(buff)) { cerr << "ERROR: Failed to write output. \n"; --- 54,62 ---- } + #if 0 //////////////////////////////////////////// // Alernate main loop... for(;!inputStream.IsGetEOS();) { // Is End Of Stream ? ! ImageC<ByteT> buff = inputStream.Get(); if(!outputStream.Put(buff)) { cerr << "ERROR: Failed to write output. \n"; Index: rawFormat.cc =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/rawFormat.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** rawFormat.cc 2001/05/24 22:50:53 1.3 --- rawFormat.cc 2001/08/28 13:33:14 1.4 *************** *** 7,11 **** ////////////////////////////////////////////////// //! rcsid="$Id$" ! //! lib=RavlImage //! file="Ravl/Image/VideoIO/rawFormat.cc" --- 7,11 ---- ////////////////////////////////////////////////// //! rcsid="$Id$" ! //! lib=RavlVideoIO //! file="Ravl/Image/VideoIO/rawFormat.cc" Index: rawFormat.hh =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/rawFormat.hh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** rawFormat.hh 2001/05/24 22:50:53 1.4 --- rawFormat.hh 2001/08/28 13:33:14 1.5 *************** *** 14,18 **** //! file="Ravl/Image/VideoIO/rawFormat.hh" //! example=exImgSeq.cc ! //! lib=RavlImage #include "Ravl/DP/FileFormat.hh" --- 14,18 ---- //! file="Ravl/Image/VideoIO/rawFormat.hh" //! example=exImgSeq.cc ! //! lib=RavlVideoIO #include "Ravl/DP/FileFormat.hh" Index: rgbFormat.cc =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/rgbFormat.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** rgbFormat.cc 2001/05/24 22:50:53 1.3 --- rgbFormat.cc 2001/08/28 13:33:14 1.4 *************** *** 7,11 **** ////////////////////////////////////////////////// //! rcsid="$Id$" ! //! lib=RavlImage //! file="Ravl/Image/VideoIO/rgbFormat.cc" --- 7,11 ---- ////////////////////////////////////////////////// //! rcsid="$Id$" ! //! lib=RavlVideoIO //! file="Ravl/Image/VideoIO/rgbFormat.cc" Index: rgbFormat.hh =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/rgbFormat.hh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** rgbFormat.hh 2001/05/24 22:50:53 1.4 --- rgbFormat.hh 2001/08/28 13:33:14 1.5 *************** *** 14,18 **** //! file="Ravl/Image/VideoIO/rgbFormat.hh" //! example=exImgSeq.cc ! //! lib=RavlImage --- 14,18 ---- //! file="Ravl/Image/VideoIO/rgbFormat.hh" //! example=exImgSeq.cc ! //! lib=RavlVideoIO Index: syuvFormat.cc =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/syuvFormat.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** syuvFormat.cc 2001/05/24 22:50:53 1.3 --- syuvFormat.cc 2001/08/28 13:33:14 1.4 *************** *** 7,11 **** ////////////////////////////////////////////////// //! rcsid="$Id$" ! //! lib=RavlImage //! file="Ravl/Image/VideoIO/syuvFormat.cc" --- 7,11 ---- ////////////////////////////////////////////////// //! rcsid="$Id$" ! //! lib=RavlVideoIO //! file="Ravl/Image/VideoIO/syuvFormat.cc" Index: syuvFormat.hh =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/syuvFormat.hh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** syuvFormat.hh 2001/05/24 22:50:53 1.4 --- syuvFormat.hh 2001/08/28 13:33:14 1.5 *************** *** 14,18 **** //! file="Ravl/Image/VideoIO/syuvFormat.hh" //! example=exImgSeq.cc ! //! lib=RavlImage #include "Ravl/DP/FileFormat.hh" --- 14,18 ---- //! file="Ravl/Image/VideoIO/syuvFormat.hh" //! example=exImgSeq.cc ! //! lib=RavlVideoIO #include "Ravl/DP/FileFormat.hh" Index: yuvFormat.cc =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/yuvFormat.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** yuvFormat.cc 2001/05/24 22:50:53 1.3 --- yuvFormat.cc 2001/08/28 13:33:14 1.4 *************** *** 7,11 **** ////////////////////////////////////////////////// //! rcsid="$Id$" ! //! lib=RavlImage //! file="Ravl/Image/VideoIO/yuvFormat.cc" --- 7,11 ---- ////////////////////////////////////////////////// //! rcsid="$Id$" ! //! lib=RavlVideoIO //! file="Ravl/Image/VideoIO/yuvFormat.cc" Index: yuvFormat.hh =================================================================== RCS file: /cvsroot/ravl/Ravl/Image/VideoIO/yuvFormat.hh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** yuvFormat.hh 2001/05/24 22:50:53 1.4 --- yuvFormat.hh 2001/08/28 13:33:14 1.5 *************** *** 14,18 **** //! file="Ravl/Image/VideoIO/yuvFormat.hh" //! example=exImgSeq.cc ! //! lib=RavlImage #include "Ravl/DP/FileFormat.hh" --- 14,18 ---- //! file="Ravl/Image/VideoIO/yuvFormat.hh" //! example=exImgSeq.cc ! //! lib=RavlVideoIO #include "Ravl/DP/FileFormat.hh" --- VidIO.cc DELETED --- |