Author: frankie
Date: 2007-03-06 13:56:35 +0000 (Tue, 06 Mar 2007)
New Revision: 634

Modified:
   packages/gdal-grass/trunk/configure
   packages/gdal-grass/trunk/configure.in
   packages/gdal-grass/trunk/debian/changelog
   packages/gdal-grass/trunk/debian/control
   packages/gdal-grass/trunk/debian/rules
   packages/gdal-grass/trunk/grass57dataset.cpp
   packages/gdal-grass/trunk/ogrgrasslayer.cpp
Log:
Moving to 1.4.0


Modified: packages/gdal-grass/trunk/configure
===================================================================
--- packages/gdal-grass/trunk/configure 2007-03-06 13:52:03 UTC (rev 633)
+++ packages/gdal-grass/trunk/configure 2007-03-06 13:56:35 UTC (rev 634)
@@ -2942,7 +2942,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgrass_gis -L$with_grass/lib -lgrass_datetime -lgrass_gproj 
-lgrass_vect $LIBS"
+LIBS="-lgrass_gis -L$with_grass/lib -lgrass_I -lgrass_vask -lgrass_gmath 
-lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase 
-lgrass_dbmiclient -lgrass_dgl -lgrass_dig2 -lgrass_rtree -lgrass_linkm $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3008,12 +3008,12 @@
 
 
   if test "$GRASS_SETTING" = "grass57+" ; then
-    LIBS="-L$with_grass/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis 
-lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient 
$LIBS"
+    LIBS="-L$with_grass/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis 
-lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient 
-lgrass_dgl -lgrass_dig2 -lgrass_rtree -lgrass_linkm $LIBS"
     GRASS_INCLUDE="-I$with_grass/include"
     GRASS_GISBASE="$with_grass"
   else
-    { { echo "$as_me:$LINENO: error: --with-grass=$with_grass requested, but 
libraries not found!" >&5
-echo "$as_me: error: --with-grass=$with_grass requested, but libraries not 
found!" >&2;}
+    { { echo "$as_me:$LINENO: error: --with-grass=$with_grass requested, but 
libraries not found!  Perhaps you need to set LD_LIBRARY_PATH to include 
$with_grass/lib?" >&5
+echo "$as_me: error: --with-grass=$with_grass requested, but libraries not 
found!  Perhaps you need to set LD_LIBRARY_PATH to include $with_grass/lib?" 
>&2;}
    { (exit 1); exit 1; }; }
   fi
 fi

Modified: packages/gdal-grass/trunk/configure.in
===================================================================
--- packages/gdal-grass/trunk/configure.in      2007-03-06 13:52:03 UTC (rev 
633)
+++ packages/gdal-grass/trunk/configure.in      2007-03-06 13:56:35 UTC (rev 
634)
@@ -1,5 +1,5 @@
 dnl ***************************************************************************
-dnl $Id: configure.in,v 1.8 2006/04/04 02:54:27 fwarmerdam Exp $
+dnl $Id: configure.in,v 1.10 2006/08/23 20:06:02 fwarmerdam Exp $
 dnl
 dnl Project:  GDAL GRASS Plugin
 dnl Purpose:  Configure source file.
@@ -123,14 +123,14 @@
 
 if test "$with_grass" != "yes" ; then
 
-  
AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib
 -lgrass_datetime -lgrass_gproj -lgrass_vect)
+  
AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib
 -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime 
-lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient -lgrass_dgl 
-lgrass_dig2 -lgrass_rtree -lgrass_linkm)
    
   if test "$GRASS_SETTING" = "grass57+" ; then   
-    LIBS="-L$with_grass/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis 
-lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient 
$LIBS"
+    LIBS="-L$with_grass/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis 
-lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient 
-lgrass_dgl -lgrass_dig2 -lgrass_rtree -lgrass_linkm $LIBS"
     GRASS_INCLUDE="-I$with_grass/include"
     GRASS_GISBASE="$with_grass"
   else
-    AC_MSG_ERROR([--with-grass=$with_grass requested, but libraries not 
found!])
+    AC_MSG_ERROR([--with-grass=$with_grass requested, but libraries not found! 
 Perhaps you need to set LD_LIBRARY_PATH to include $with_grass/lib?])
   fi
 fi
 

Modified: packages/gdal-grass/trunk/debian/changelog
===================================================================
--- packages/gdal-grass/trunk/debian/changelog  2007-03-06 13:52:03 UTC (rev 
633)
+++ packages/gdal-grass/trunk/debian/changelog  2007-03-06 13:56:35 UTC (rev 
634)
@@ -1,3 +1,9 @@
+libgdal-grass (1.4.0-2) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]>  Tue,  6 Mar 2007 14:42:01 
+0100
+
 libgdal-grass (1.3.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/gdal-grass/trunk/debian/control
===================================================================
--- packages/gdal-grass/trunk/debian/control    2007-03-06 13:52:03 UTC (rev 
633)
+++ packages/gdal-grass/trunk/debian/control    2007-03-06 13:56:35 UTC (rev 
634)
@@ -3,10 +3,10 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Steve Halasz <[EMAIL PROTECTED]>, Silke Reimer <[EMAIL PROTECTED]>, 
Francesco Paolo Lovergine <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.1.25), d-shlibs, libgdal1-1.3.2-dev, grass-dev 
(>= 6.0.2-5), grass (>= 6.0.2-5)
+Build-Depends: debhelper (>> 4.1.25), d-shlibs, libgdal1-dev (>=1.4.0-1) | 
libgdal1-1.3.2-dev, grass-dev (>= 6.0.2-5), grass (>= 6.0.2-5)
 Standards-Version: 3.7.2
 
-Package: libgdal1-1.3.2-grass
+Package: libgdal1-1.4.0-grass
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, grass (>= 6.0.2-5)

Modified: packages/gdal-grass/trunk/debian/rules
===================================================================
--- packages/gdal-grass/trunk/debian/rules      2007-03-06 13:52:03 UTC (rev 
633)
+++ packages/gdal-grass/trunk/debian/rules      2007-03-06 13:56:35 UTC (rev 
634)
@@ -7,7 +7,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export PKGNAME=libgdal1-1.3.2-grass
+export PKGNAME=libgdal1-1.4.0-grass
 
 config.status:
        dh_testdir

Modified: packages/gdal-grass/trunk/grass57dataset.cpp
===================================================================
--- packages/gdal-grass/trunk/grass57dataset.cpp        2007-03-06 13:52:03 UTC 
(rev 633)
+++ packages/gdal-grass/trunk/grass57dataset.cpp        2007-03-06 13:56:35 UTC 
(rev 634)
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: grass57dataset.cpp,v 1.6 2006/02/13 17:39:31 rblazek Exp $
+ * $Id: grass57dataset.cpp,v 1.8 2006/11/09 15:56:47 rblazek Exp $
  *
  * Project:  GRASS Driver
  * Purpose:  Implement GRASS raster read/write support
@@ -31,6 +31,12 @@
  ******************************************************************************
  *
  * $Log: grass57dataset.cpp,v $
+ * Revision 1.8  2006/11/09 15:56:47  rblazek
+ * set also the band invalid if reopen fails
+ *
+ * Revision 1.7  2006/11/09 15:30:45  rblazek
+ * check if ResetReading failed
+ *
  * Revision 1.6  2006/02/13 17:39:31  rblazek
  * header files moved to grass
  *
@@ -73,7 +79,7 @@
 
 #define GRASS_MAX_COLORS 100000  // what is the right value
 
-CPL_CVSID("$Id: grass57dataset.cpp,v 1.6 2006/02/13 17:39:31 rblazek Exp $");
+CPL_CVSID("$Id: grass57dataset.cpp,v 1.8 2006/11/09 15:56:47 rblazek Exp $");
 
 CPL_C_START
 void   GDALRegister_GRASS(void);
@@ -409,7 +415,10 @@
         sNewWindow->ew_res != sOpenWindow.ew_res || sNewWindow->ns_res != 
sOpenWindow.ns_res ||
         sNewWindow->rows   != sOpenWindow.rows   || sNewWindow->cols   != 
sOpenWindow.cols )
     {
-        G_close_cell( hCell );
+       if( hCell >= 0 ) {
+            G_close_cell( hCell );
+           hCell = -1;
+       }
 
        /* Set window */
        G_set_window( sNewWindow );
@@ -423,6 +432,7 @@
        
        if ( (hCell = G_open_cell_old( pszCellName, pszMapset)) < 0 ) {
            CPLError( CE_Warning, CPLE_AppDefined, "GRASS: Cannot open raster 
'%s'", pszCellName );
+            this->valid = false;
            return CE_Failure;
        }
 
@@ -459,6 +469,8 @@
 CPLErr GRASSRasterBand::IReadBlock( int nBlockXOff, int nBlockYOff, void * 
pImage )
 
 {
+    if ( ! this->valid ) return CE_Failure;
+
     // Reset window because IRasterIO could be previosly called
     if ( ResetReading ( &(((GRASSDataset *)poDS)->sCellInfo) ) != CE_None ) {
        return CE_Failure;
@@ -510,6 +522,8 @@
     /* Calculate the region */
     struct Cell_head sWindow;
     struct Cell_head *psDsWindow;
+    
+    if ( ! this->valid ) return CE_Failure;
 
     psDsWindow = &(((GRASSDataset *)poDS)->sCellInfo);
     
@@ -526,7 +540,10 @@
     /* Reset resolution */
     G_adjust_Cell_head ( &sWindow, 1, 1);
 
-    ResetReading ( &sWindow );
+    if ( ResetReading ( &sWindow ) != CE_None )
+    {
+        return CE_Failure;
+    }
     
     /* Read Data */
     CELL  *cbuf = NULL;

Modified: packages/gdal-grass/trunk/ogrgrasslayer.cpp
===================================================================
--- packages/gdal-grass/trunk/ogrgrasslayer.cpp 2007-03-06 13:52:03 UTC (rev 
633)
+++ packages/gdal-grass/trunk/ogrgrasslayer.cpp 2007-03-06 13:56:35 UTC (rev 
634)
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: ogrgrasslayer.cpp,v 1.3 2006/02/14 13:01:49 rblazek Exp $
+ * $Id: ogrgrasslayer.cpp,v 1.4 2006/07/31 15:49:30 fwarmerdam Exp $
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Implements OGRGRASSLayer class.
@@ -28,6 +28,9 @@
  ******************************************************************************
  *
  * $Log: ogrgrasslayer.cpp,v $
+ * Revision 1.4  2006/07/31 15:49:30  fwarmerdam
+ * Try and enable datetime support per email from Markus.  Not tested yet.
+ *
  * Revision 1.3  2006/02/14 13:01:49  rblazek
  * dont kill on win
  *
@@ -44,7 +47,7 @@
 #include "ogrgrass.h"
 #include "cpl_conv.h"
 
-CPL_CVSID("$Id: ogrgrasslayer.cpp,v 1.3 2006/02/14 13:01:49 rblazek Exp $");
+CPL_CVSID("$Id: ogrgrasslayer.cpp,v 1.4 2006/07/31 15:49:30 fwarmerdam Exp $");
 
 /************************************************************************/
 /*                           OGRGRASSLayer()                            */
@@ -160,7 +163,7 @@
                            ogrFtype = OFTString;
                            break; 
                         case DB_C_TYPE_DATETIME:
-                           ogrFtype = OFTString;
+                           ogrFtype = OFTDateTime;
                            break; 
                    }
 


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to