Commits

Jed Brown committed 7dbde84

Fixes for libAfterImage compilation, ImageMagick is still just a stub

Hg-commit: fb79e104b74267c74aa64f125e7eb6a64bce4b14

Comments (0)

Files changed (4)

config/PETSc/packages/afterimage.py

     self.includedir    = ''
     self.libdir        = '../../lib'
     self.double        = 0
+    self.complex       = 1
 
   def setupDependencies(self, framework):
     PETSc.package.NewPackage.setupDependencies(self, framework)

config/PETSc/packages/imagemagick.py

   def __init__(self, framework):
     PETSc.package.NewPackage.__init__(self, framework)
     self.functions     = ['IsMagickInstantiated']
-    self.includes      = ['MagicCore/MagickCore.h']
-    self.liblist       = [['libMagicCore.a']]
+    self.includes      = ['magick/MagickCore.h']
+    self.liblist       = [['libMagickCore.a']]
 
 
 

src/sys/draw/impls/x/xinit.c

 #include <afterimage.h>
 #undef __FUNCT__  
 #define __FUNCT__ "PetscDrawSave_X" 
-PetscErrorCode PetscDrawSave_X(PetscDraw draw,PetscViewer viewer)
+PetscErrorCode PetscDrawSave_X(PetscDraw draw)
 {
   PetscDraw_X              *drawx = (PetscDraw_X*)draw->data;
   XImage                   *image;
 void deflateEnd(void) {;}
 
 #elif defined(PETSC_HAVE_IMAGEMAGICK)
-#include <MagicCore/MagickCore.h>
+#include <magick/MagickCore.h>
 #undef __FUNCT__  
 #define __FUNCT__ "PetscDrawSave_X" 
-PetscErrorCode PetscDrawSave_X(PetscDraw draw,PetscViewer viewer)
+PetscErrorCode PetscDrawSave_X(PetscDraw draw)
 {
   PetscDraw_X  *drawx = (PetscDraw_X*)draw->data;
   Image        *image;

src/sys/draw/impls/x/xops.c

   PetscFunctionReturn(0);
 }
 
-PetscErrorCode PetscDrawSave_X(PetscDraw,PetscViewer);
+PetscErrorCode PetscDrawSave_X(PetscDraw);
 PetscErrorCode PetscDrawSetSave_X(PetscDraw,const char*);
 
 static struct _PetscDrawOps DvOps = { PetscDrawSetDoubleBuffer_X,