Re: Bug#506992: vtk: diff for NMU version 5.6.1-6.1
On Mon, Aug 22, 2011 at 9:19 PM, Michael Schutte <michi@debian.org> wrote:
> Hi,
>
> On Mon, Aug 22, 2011 at 08:46:00PM +0200, Andreas Tille wrote:
>> IMHO it is quite straightforeward to verify sqlite whether there are
>> some changes. I would think handling this apropriately and overriding
>> the ftgl library with the (not so good) reason to push foreward this
>> package to be able to get other FTBFS packages back again while having
>> not enough time to check ftgl carefully is a reasonable way to go.
>> (For sure the brave solution is even checking ftgl ...)
>
> What intimidates me is that there seems to be some s/sqlite/vtk_sqlite/
> all over the place. This probably requires a massive patch.
>
> On Mon, Aug 22, 2011 at 08:59:55PM +0200, Mathieu Malaterre wrote:
>> Working on it right now.
>
> Thanks a lot! :-)
Hum... I have to give up for now. my git-fu is really not up to date.
I have no clue on how to integrate my patch to:
git://anonscm.debian.org/collab-maint/vtk.git
So I am attaching them here. One also need to change the
debian/control file to add libsqlite3-dev
I am fairly confident with the sqlite patch. I am a lot less confident
with the ftgl patch. For some reason FTLibrary.h is not installed in
ftgl installation but seems to be used by VTK internals.
Is is possible to add a lintian override for now, until all those ftgl
issues gets resolved.
Thanks,
--
Mathieu
Index: vtk-5.6.1/Utilities/CMakeLists.txt
===================================================================
--- vtk-5.6.1.orig/Utilities/CMakeLists.txt 2011-08-22 20:55:47.000000000 +0200
+++ vtk-5.6.1/Utilities/CMakeLists.txt 2011-08-22 22:10:33.000000000 +0200
@@ -40,7 +40,7 @@
IF(VTK_USE_METAIO)
SUBDIRS(vtkmetaio)
ENDIF(VTK_USE_METAIO)
-SUBDIRS(vtksqlite)
+#SUBDIRS(vtksqlite)
IF(VTK_HAS_EXODUS)
SUBDIRS(vtkexodus2)
@@ -67,7 +67,7 @@
ENDIF(VTK_USE_PARALLEL)
IF(VTK_USE_RENDERING)
- SUBDIRS(ftgl ParseOGLExt)
+ SUBDIRS(ParseOGLExt)
ENDIF(VTK_USE_RENDERING)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
Index: vtk-5.6.1/Charts/CMakeLists.txt
===================================================================
--- vtk-5.6.1.orig/Charts/CMakeLists.txt 2011-08-22 20:57:34.000000000 +0200
+++ vtk-5.6.1/Charts/CMakeLists.txt 2011-08-22 20:57:39.000000000 +0200
@@ -10,7 +10,7 @@
ENDIF (JAVA_AWT_LIBRARY)
SET(KIT_INTERFACE_LIBRARIES vtkHybrid vtkViews)
-SET(KIT_LIBS vtkIO vtkftgl
+SET(KIT_LIBS vtkIO ftgl
${VTK_FREETYPE_LIBRARIES}
)
Index: vtk-5.6.1/Rendering/vtkFreeTypeUtilities.cxx
===================================================================
--- vtk-5.6.1.orig/Rendering/vtkFreeTypeUtilities.cxx 2011-08-22 21:48:12.000000000 +0200
+++ vtk-5.6.1/Rendering/vtkFreeTypeUtilities.cxx 2011-08-22 22:06:26.000000000 +0200
@@ -23,9 +23,10 @@
// FTGL
-#include "vtkftglConfig.h"
-#include "FTLibrary.h"
-#include "FTGLPixmapFont.h"
+//#include "vtkftglConfig.h"
+//#include "FTLibrary.h"
+//#include "FTGLPixmapFont.h"
+#include <FTGL/ftgl.h>
// The embedded fonts
@@ -81,7 +82,7 @@
#if VTK_FTFC_DEBUG_CD
printf("vtkFreeTypeUtilitiesCleanup::vtkFreeTypeUtilitiesCleanup\n");
#endif
- FTLibraryCleanup::AddDependency(&vtkFreeTypeUtilitiesCleanupCallback);
+ //FTLibraryCleanup::AddDependency(&vtkFreeTypeUtilitiesCleanupCallback);
}
//----------------------------------------------------------------------------
@@ -181,11 +182,11 @@
printf("vtkFreeTypeUtilities::GetLibrary\n");
#endif
- FTLibrary *ftgl_lib = FTLibrary::GetInstance();
- if (ftgl_lib)
- {
- return ftgl_lib->GetLibrary();
- }
+ //FTLibrary *ftgl_lib = FTLibrary::GetInstance();
+ //if (ftgl_lib)
+ // {
+ // return ftgl_lib->GetLibrary();
+ // }
return NULL;
}
@@ -1394,8 +1395,8 @@
if (this->Entries[i]->Font)
{
printf(" [F: %p]", static_cast<void *>(this->Entries[i]->Font));
- printf("\n [f: %p]",
- static_cast<void*>(*(this->Entries[i]->Font->Face()->Face())));
+// printf("\n [f: %p]",
+// static_cast<void*>(*(this->Entries[i]->Font->Face()->Face())));
}
printf("\n");
@@ -1544,7 +1545,7 @@
// OK the font is not cached, try to create one
- FTFont *font = new FTGLPixmapFont;
+ FTFont *font = NULL; // = new FTGLPixmapFont;
// A face file name has been provided, try to load it, otherwise
// just use the embedded fonts (i.e. font family, bold and italic attribs)
@@ -1649,7 +1650,8 @@
unsigned char *ptr = EmbeddedFonts
[tprop->GetFontFamily()][tprop->GetBold()][tprop->GetItalic()].ptr;
- if (!font->Open(ptr, length, false))
+ font = new FTGLPixmapFont(ptr, length);
+ if (false /* !font->Open(ptr, length, false) */ )
{
vtkErrorWithObjectMacro(
tprop,
Index: vtk-5.6.1/Rendering/vtkOpenGLFreeTypeTextMapper.cxx
===================================================================
--- vtk-5.6.1.orig/Rendering/vtkOpenGLFreeTypeTextMapper.cxx 2011-08-22 22:07:09.000000000 +0200
+++ vtk-5.6.1/Rendering/vtkOpenGLFreeTypeTextMapper.cxx 2011-08-22 22:09:04.000000000 +0200
@@ -23,11 +23,11 @@
#include "vtkToolkits.h" // for VTK_USE_GL2PS
#include "vtkFreeTypeUtilities.h"
-#include "vtkftglConfig.h"
+//#include "vtkftglConfig.h"
#include "vtkgluPickMatrix.h"
-#include "FTFont.h"
+#include <FTGL/ftgl.h>
#ifdef VTK_USE_GL2PS
#include "vtk_gl2ps.h"
@@ -429,7 +429,7 @@
// Draw the shadow text
- shadow_font->render(this->Input, ftgl_context);
+ //shadow_font->Render(this->Input, ftgl_context);
// Get the font again, Duh, since it may have been freed from the
// cache by the shadow font
@@ -466,7 +466,7 @@
// Display a string
- font->render(this->Input, ftgl_context);
+ //font->render(this->Input, ftgl_context);
glFlush();
Index: vtk-5.6.1/IO/vtkSQLiteDatabase.cxx
===================================================================
--- vtk-5.6.1.orig/IO/vtkSQLiteDatabase.cxx 2011-08-22 22:22:20.000000000 +0200
+++ vtk-5.6.1/IO/vtkSQLiteDatabase.cxx 2011-08-22 22:22:24.000000000 +0200
@@ -29,7 +29,7 @@
#include <vtksys/ios/fstream>
#include <vtksys/ios/sstream>
-#include <vtksqlite/vtk_sqlite3.h>
+#include <sqlite3.h>
vtkStandardNewMacro(vtkSQLiteDatabase);
@@ -307,15 +307,15 @@
}
}
- int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance));
+ int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance));
- if (result != VTK_SQLITE_OK)
+ if (result != SQLITE_OK)
{
vtkDebugMacro(<<"SQLite open() failed. Error code is "
<< result << " and message is "
- << vtk_sqlite3_errmsg(this->SQLiteInstance) );
+ << sqlite3_errmsg(this->SQLiteInstance) );
- vtk_sqlite3_close(this->SQLiteInstance);
+ sqlite3_close(this->SQLiteInstance);
return false;
}
else
@@ -334,8 +334,8 @@
}
else
{
- int result = vtk_sqlite3_close(this->SQLiteInstance);
- if (result != VTK_SQLITE_OK)
+ int result = sqlite3_close(this->SQLiteInstance);
+ if (result != SQLITE_OK)
{
vtkWarningMacro(<< "Close(): SQLite returned result code " << result);
}
@@ -374,7 +374,7 @@
if (!status)
{
vtkErrorMacro(<< "GetTables(): Database returned error: "
- << vtk_sqlite3_errmsg(this->SQLiteInstance) );
+ << sqlite3_errmsg(this->SQLiteInstance) );
query->Delete();
return this->Tables;
}
@@ -403,7 +403,7 @@
if (!status)
{
vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: "
- << vtk_sqlite3_errmsg(this->SQLiteInstance) );
+ << sqlite3_errmsg(this->SQLiteInstance) );
query->Delete();
return NULL;
}
@@ -466,10 +466,10 @@
// ----------------------------------------------------------------------
bool vtkSQLiteDatabase::HasError()
{
- return (vtk_sqlite3_errcode(this->SQLiteInstance)!=VTK_SQLITE_OK);
+ return (sqlite3_errcode(this->SQLiteInstance)!=SQLITE_OK);
}
const char* vtkSQLiteDatabase::GetLastErrorText()
{
- return vtk_sqlite3_errmsg(this->SQLiteInstance);
+ return sqlite3_errmsg(this->SQLiteInstance);
}
Index: vtk-5.6.1/IO/vtkSQLiteQuery.cxx
===================================================================
--- vtk-5.6.1.orig/IO/vtkSQLiteQuery.cxx 2011-08-22 22:22:20.000000000 +0200
+++ vtk-5.6.1/IO/vtkSQLiteQuery.cxx 2011-08-22 22:22:24.000000000 +0200
@@ -25,7 +25,7 @@
#include "vtkVariant.h"
#include "vtkVariantArray.h"
-#include <vtksqlite/vtk_sqlite3.h>
+#include <sqlite3.h>
#include <assert.h>
@@ -43,7 +43,7 @@
{
this->Statement = NULL;
this->InitialFetch = true;
- this->InitialFetchResult=VTK_SQLITE_DONE;
+ this->InitialFetchResult=SQLITE_DONE;
this->LastErrorText = NULL;
this->TransactionInProgress = false;
}
@@ -61,7 +61,7 @@
{
if (this->Database != NULL)
{
- vtk_sqlite3_finalize(this->Statement);
+ sqlite3_finalize(this->Statement);
this->Statement = NULL;
}
}
@@ -131,8 +131,8 @@
if (this->Statement)
{
vtkDebugMacro(<<"Finalizing old statement");
- int finalizeStatus = vtk_sqlite3_finalize(this->Statement);
- if (finalizeStatus != VTK_SQLITE_OK)
+ int finalizeStatus = sqlite3_finalize(this->Statement);
+ if (finalizeStatus != SQLITE_OK)
{
vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code "
<< finalizeStatus);
@@ -151,19 +151,19 @@
return false;
}
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
+ sqlite3 *db = dbContainer->SQLiteInstance;
const char *unused_statement;
- int prepareStatus = vtk_sqlite3_prepare_v2(db,
+ int prepareStatus = sqlite3_prepare_v2(db,
this->Query,
static_cast<int>(strlen(this->Query)),
&this->Statement,
&unused_statement);
- if (prepareStatus != VTK_SQLITE_OK)
+ if (prepareStatus != SQLITE_OK)
{
- this->SetLastErrorText(vtk_sqlite3_errmsg(db));
- vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message "
+ this->SetLastErrorText(sqlite3_errmsg(db));
+ vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message "
<< this->GetLastErrorText()
<< " on statement: '"
<< this->Query << "'");
@@ -194,31 +194,31 @@
}
else
{
- vtk_sqlite3_reset(this->Statement);
+ sqlite3_reset(this->Statement);
}
vtkDebugMacro(<<"Execute(): Query ready to execute.");
this->InitialFetch = true;
- int result = vtk_sqlite3_step(this->Statement);
+ int result = sqlite3_step(this->Statement);
this->InitialFetchResult = result;
- if (result == VTK_SQLITE_DONE)
+ if (result == SQLITE_DONE)
{
this->SetLastErrorText(NULL);
this->Active = true;
return true;
}
- else if (result != VTK_SQLITE_ROW)
+ else if (result != SQLITE_ROW)
{
vtkSQLiteDatabase *dbContainer =
vtkSQLiteDatabase::SafeDownCast(this->Database);
assert(dbContainer != NULL);
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
+ sqlite3 *db = dbContainer->SQLiteInstance;
- this->SetLastErrorText(vtk_sqlite3_errmsg(db));
- vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message "
+ this->SetLastErrorText(sqlite3_errmsg(db));
+ vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message "
<< this->GetLastErrorText());
this->Active = false;
return false;
@@ -239,7 +239,7 @@
}
else
{
- return vtk_sqlite3_column_count(this->Statement);
+ return sqlite3_column_count(this->Statement);
}
}
@@ -259,7 +259,7 @@
}
else
{
- return vtk_sqlite3_column_name(this->Statement, column);
+ return sqlite3_column_name(this->Statement, column);
}
}
@@ -279,22 +279,22 @@
}
else
{
- switch (vtk_sqlite3_column_type(this->Statement, column))
+ switch (sqlite3_column_type(this->Statement, column))
{
- case VTK_SQLITE_INTEGER:
+ case SQLITE_INTEGER:
return VTK_INT;
- case VTK_SQLITE_FLOAT:
+ case SQLITE_FLOAT:
return VTK_FLOAT;
- case VTK_SQLITE_TEXT:
+ case SQLITE_TEXT:
return VTK_STRING;
- case VTK_SQLITE_BLOB:
+ case SQLITE_BLOB:
return VTK_STRING; // until we have a BLOB type of our own
- case VTK_SQLITE_NULL:
+ case SQLITE_NULL:
return VTK_VOID; // ??? what makes sense here?
default:
{
vtkErrorMacro(<<"GetFieldType(): Unknown data type "
- << vtk_sqlite3_column_type(this->Statement, column)
+ << sqlite3_column_type(this->Statement, column)
<<" from SQLite.");
return VTK_VOID;
}
@@ -315,7 +315,7 @@
{
vtkDebugMacro(<<"NextRow(): Initial fetch being handled.");
this->InitialFetch = false;
- if (this->InitialFetchResult == VTK_SQLITE_DONE)
+ if (this->InitialFetchResult == SQLITE_DONE)
{
return false;
}
@@ -326,12 +326,12 @@
}
else
{
- int result = vtk_sqlite3_step(this->Statement);
- if (result == VTK_SQLITE_DONE)
+ int result = sqlite3_step(this->Statement);
+ if (result == SQLITE_DONE)
{
return false;
}
- else if (result == VTK_SQLITE_ROW)
+ else if (result == SQLITE_ROW)
{
return true;
}
@@ -339,8 +339,8 @@
{
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
- this->SetLastErrorText(vtk_sqlite3_errmsg(db));
+ sqlite3 *db = dbContainer->SQLiteInstance;
+ this->SetLastErrorText(sqlite3_errmsg(db));
vtkErrorMacro(<<"NextRow(): Database returned error code "
<< result << " with the following message: "
<< this->GetLastErrorText());
@@ -366,33 +366,33 @@
}
else
{
- switch (vtk_sqlite3_column_type(this->Statement, column))
+ switch (sqlite3_column_type(this->Statement, column))
{
- case VTK_SQLITE_INTEGER:
- return vtkVariant(vtk_sqlite3_column_int(this->Statement, column));
+ case SQLITE_INTEGER:
+ return vtkVariant(sqlite3_column_int(this->Statement, column));
- case VTK_SQLITE_FLOAT:
- return vtkVariant(vtk_sqlite3_column_double(this->Statement, column));
+ case SQLITE_FLOAT:
+ return vtkVariant(sqlite3_column_double(this->Statement, column));
- case VTK_SQLITE_TEXT:
+ case SQLITE_TEXT:
{
vtksys_ios::ostringstream str;
- str << vtk_sqlite3_column_text(this->Statement, column);
+ str << sqlite3_column_text(this->Statement, column);
return vtkVariant(vtkStdString(str.str()));
}
- case VTK_SQLITE_BLOB:
+ case SQLITE_BLOB:
{
// This is a hack ... by passing the BLOB to vtkStdString with an explicit
// byte count, we ensure that the string will store all of the BLOB's bytes,
// even if there are NULL values.
return vtkVariant(vtkStdString(
- static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)),
- vtk_sqlite3_column_bytes(this->Statement, column)));
+ static_cast<const char*>(sqlite3_column_blob(this->Statement, column)),
+ sqlite3_column_bytes(this->Statement, column)));
}
- case VTK_SQLITE_NULL:
+ case SQLITE_NULL:
default:
return vtkVariant();
}
@@ -423,11 +423,11 @@
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
+ sqlite3 *db = dbContainer->SQLiteInstance;
char *errorMessage = NULL;
- int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
+ int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
- if (result == VTK_SQLITE_OK)
+ if (result == SQLITE_OK)
{
this->TransactionInProgress = true;
this->SetLastErrorText(NULL);
@@ -451,7 +451,7 @@
{
if (this->Statement)
{
- vtk_sqlite3_finalize(this->Statement);
+ sqlite3_finalize(this->Statement);
this->Statement = NULL;
}
@@ -463,11 +463,11 @@
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
+ sqlite3 *db = dbContainer->SQLiteInstance;
char *errorMessage = NULL;
- int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
+ int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
- if (result == VTK_SQLITE_OK)
+ if (result == SQLITE_OK)
{
this->TransactionInProgress = false;
this->SetLastErrorText(NULL);
@@ -499,11 +499,11 @@
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
- vtk_sqlite3 *db = dbContainer->SQLiteInstance;
+ sqlite3 *db = dbContainer->SQLiteInstance;
char *errorMessage = NULL;
- int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
+ int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
- if (result == VTK_SQLITE_OK)
+ if (result == SQLITE_OK)
{
this->TransactionInProgress = false;
this->SetLastErrorText(NULL);
@@ -647,11 +647,11 @@
if (this->Active)
{
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
+ sqlite3_reset(this->Statement);
}
- int status = vtk_sqlite3_bind_int(this->Statement, index+1, value);
+ int status = sqlite3_bind_int(this->Statement, index+1, value);
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_int returned error: " << status;
@@ -676,11 +676,11 @@
if (this->Active)
{
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
+ sqlite3_reset(this->Statement);
}
- int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value));
+ int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite_int64>(value));
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_int64 returned error: " << status;
@@ -705,12 +705,12 @@
if (this->Active)
{
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
+ sqlite3_reset(this->Statement);
}
- int status = vtk_sqlite3_bind_double(this->Statement, index+1, value);
+ int status = sqlite3_bind_double(this->Statement, index+1, value);
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_double returned error: " << status;
@@ -734,12 +734,12 @@
if (this->Active)
{
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
+ sqlite3_reset(this->Statement);
}
- int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT);
+ int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT);
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_text returned error: " << status;
@@ -763,17 +763,17 @@
if (this->Active)
{
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
+ sqlite3_reset(this->Statement);
}
int status =
- vtk_sqlite3_bind_blob(this->Statement,
+ sqlite3_bind_blob(this->Statement,
index+1,
data,
length,
- VTK_SQLITE_TRANSIENT);
+ SQLITE_TRANSIENT);
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_blob returned error: " << status;
@@ -797,12 +797,12 @@
if (this->Active)
{
this->Active = false;
- vtk_sqlite3_reset(this->Statement);
+ sqlite3_reset(this->Statement);
}
- int status = vtk_sqlite3_clear_bindings(this->Statement);
+ int status = sqlite3_clear_bindings(this->Statement);
- if (status != VTK_SQLITE_OK)
+ if (status != SQLITE_OK)
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_clear_bindings returned error: " << status;
Index: vtk-5.6.1/IO/vtkSQLiteDatabase.h
===================================================================
--- vtk-5.6.1.orig/IO/vtkSQLiteDatabase.h 2011-08-22 22:22:20.000000000 +0200
+++ vtk-5.6.1/IO/vtkSQLiteDatabase.h 2011-08-22 22:22:24.000000000 +0200
@@ -48,7 +48,7 @@
class vtkSQLQuery;
class vtkSQLiteQuery;
class vtkStringArray;
-struct vtk_sqlite3;
+struct sqlite3;
class VTK_IO_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase
{
@@ -146,7 +146,7 @@
virtual bool ParseURL(const char* url);
private:
- vtk_sqlite3 *SQLiteInstance;
+ sqlite3 *SQLiteInstance;
// We want this to be private, a user of this class
// should not be setting this for any reason
Index: vtk-5.6.1/IO/vtkSQLiteQuery.h
===================================================================
--- vtk-5.6.1.orig/IO/vtkSQLiteQuery.h 2011-08-22 22:22:20.000000000 +0200
+++ vtk-5.6.1/IO/vtkSQLiteQuery.h 2011-08-22 22:22:24.000000000 +0200
@@ -46,7 +46,7 @@
class vtkSQLiteDatabase;
class vtkVariant;
class vtkVariantArray;
-struct vtk_sqlite3_stmt;
+struct sqlite3_stmt;
class VTK_IO_EXPORT vtkSQLiteQuery : public vtkSQLQuery
{
@@ -156,7 +156,7 @@
vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented.
void operator=(const vtkSQLiteQuery &); // Not implemented.
- vtk_sqlite3_stmt *Statement;
+ sqlite3_stmt *Statement;
bool InitialFetch;
int InitialFetchResult;
char *LastErrorText;
Index: vtk-5.6.1/Rendering/CMakeLists.txt
===================================================================
--- vtk-5.6.1.orig/Rendering/CMakeLists.txt 2011-08-22 22:22:20.000000000 +0200
+++ vtk-5.6.1/Rendering/CMakeLists.txt 2011-08-22 22:22:24.000000000 +0200
@@ -9,7 +9,7 @@
ENDIF (JAVA_AWT_LIBRARY)
SET(KIT_INTERFACE_LIBRARIES vtkGraphics vtkImaging)
-SET(KIT_LIBS vtkIO vtkftgl)
+SET(KIT_LIBS vtkIO ftgl)
#INCLUDE(${VTK_CMAKE_DIR}/vtkTestGL.cmake)
#INCLUDE(${VTK_CMAKE_DIR}/vtkTestGLX.cmake)
Index: vtk-5.6.1/Hybrid/CMakeLists.txt
===================================================================
--- vtk-5.6.1.orig/Hybrid/CMakeLists.txt 2011-08-22 22:22:28.000000000 +0200
+++ vtk-5.6.1/Hybrid/CMakeLists.txt 2011-08-22 22:22:31.000000000 +0200
@@ -26,7 +26,7 @@
ENDIF (WIN32)
# for vtkImageDataLIC2D and vtkStructuredGridLIC2D
-SET( KIT_LIBS ${KIT_LIBS} vtkftgl )
+SET( KIT_LIBS ${KIT_LIBS} ftgl )
SET ( Kit_SRCS
vtk3DSImporter.cxx
Reply to: