Adding logging to the givimage dll and fixed fitsio

Author: dov

giv.nsi

@@ -53,6 +53,8 @@ File ${SYSROOT}\mingw\bin\libepoxy-0.dll
 File ${SYSROOT}\mingw\bin\libcairo*.dll
 File ${SYSROOT}\mingw\bin\libjasper*.dll
 File ${SYSROOT}\mingw\bin\zlib*.dll
+File ${SYSROOT}\mingw\bin\libzip*.dll
+File ${SYSROOT}\mingw\bin\libwebp*.dll
 File ${SYSROOT}\mingw\bin\libglib*.dll
 File ${SYSROOT}\mingw\bin\libatk*.dll
 File ${SYSROOT}\mingw\bin\libgobject*.dll
@@ -70,7 +72,9 @@ File ${SYSROOT}\mingw\bin\libwinpthread*.dll
 File ${SYSROOT}\mingw\bin\libssp-0.dll
 File ${SYSROOT}\mingw\bin\libfribidi-0.dll
 File ${SYSROOT}\mingw\bin\libharfbuzz-0.dll
+
 #File \usr\local\mingw32\bin\libjson-glib-1.0-0.dll
+File \usr\local\mingw64\bin\libcfitsio.dll
 File ${SYSROOT}\mingw\bin\gdk-pixbuf-query-loaders.exe
 
 # # Not sure that I need this. It doesn't seem to make any difference.

src/SConscript

@@ -36,7 +36,8 @@ def file2c(env, target, source):
     out.close()
     inp.close()
 
-src_giv_image = ['givimage.cc',
+src_giv_image = ['givimagedll.cc',
+                 'givimage.cc',
                  'givplugin.cc',
                  ]
 

src/giv-win.gob

@@ -18,10 +18,6 @@ requires 2.0.0
 
 %{
 #ifdef _WIN32
-#if 0
-#include <windows.h>
-#include <cairo-win32.h>
-#endif
 #endif
 
 #include <gdk/gdkkeysyms.h>
@@ -3250,20 +3246,6 @@ cb_menu_about(GtkAction *action,
     gtk_widget_destroy (about_window);
 }
 
-static void
-cb_menu_manual(GtkAction *action,
-               gpointer data)
-{
-#ifdef WIN32
-    // Fix the path
-    ShellExecute(NULL, "open", "file:///c|/Progra~1/giv/doc/giv.html", NULL, NULL, SW_SHOWNORMAL);
-#else
-    // Linux
-    system(slipprintf("xdg-open %s/giv.html",
-                      PACKAGE_DOC_DIR));
-#endif
-}
-
 static void
 cb_menu_copyright(GtkAction *action,
                   gpointer data)
@@ -4642,5 +4624,23 @@ static void create_remote_commands(GivWin *self)
                                        self);
 }
 
+#ifdef _WIN32
+#include <shellapi.h>
+#endif
+
+static void
+cb_menu_manual(GtkAction *action,
+               gpointer data)
+{
+#ifdef _WIN32
+    // Fix the path
+    ShellExecute(NULL, "open", "file:///c|/Progra~1/giv/doc/giv.html", NULL, NULL, SW_SHOWNORMAL);
+#else
+    // Linux
+    system(slipprintf("xdg-open %s/giv.html",
+                      PACKAGE_DOC_DIR));
+#endif
+}
+
 %}
 

src/giv.cc

@@ -10,6 +10,7 @@
 #include <string.h>
 #include "gtk/gtk.h"
 #include "giv-win.h"
+#include "givimagedll.h"
 #include "glib-jsonrpc/glib-jsonrpc-json.h"
 #include "glib-jsonrpc/glib-jsonrpc-client.h"
 #include "spdlog/sinks/basic_file_sink.h"
@@ -193,6 +194,9 @@ int main(int argc, char **argv)
   spdlog::info("CommitTime: {}", GIT_COMMIT_TIME);
   spdlog::info("Command line: {}", join(args," "));
 
+  spdlog::info("Calling to register logger in givimagedll");
+  registerLogger(logger);
+
   // Load an image into a remote instance of giv. If this fails,
   // then normal loading should take place.
   if (do_remote)

src/givimage.cc

@@ -10,8 +10,7 @@
 #include "givimage.h"
 #include "givplugin.h"
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include "spdlog/spdlog.h"
-
+#include <spdlog/spdlog.h>
 
 #define GIV_IMAGE_ERROR g_spawn_error_quark ()
 
@@ -719,3 +718,5 @@ GivImageType giv_image_get_type(GivImage *img)
 {
   return img->img_type;
 }
+
+

src/givimagedll.cc

@@ -0,0 +1,10 @@
+// A spdlog registration for the givimage dll
+
+#include "givimagedll.h"
+
+void registerLogger(std::shared_ptr<spdlog::logger> logger)
+{
+  spdlog::register_logger(logger);
+  spdlog::set_default_logger(logger);
+  spdlog::info("Registering the logger in the givimage dll");
+}

src/givimagedll.h

@@ -0,0 +1,14 @@
+//======================================================================
+//  givimagedll.h - 
+//
+//  Dov Grobgeld <[email protected]>
+//  Mon Jan  9 12:09:18 2023
+//----------------------------------------------------------------------
+#ifndef GIVIMAGEDLL_H
+#define GIVIMAGEDLL_H
+
+#include <spdlog/spdlog.h>
+
+void registerLogger(std::shared_ptr<spdlog::logger> logger);
+
+#endif /* GIVIMAGEDLL */

src/plugins/SConscript

@@ -22,7 +22,7 @@ if not env['SBOX']:
     conf = Configure(env,
                      custom_tests = { 'CheckPKG' : CheckPKG } )
 
-    if conf.CheckLib('cfitsio'):
+    if True or conf.CheckLib('cfitsio'):
         print("Using system cfitsio library")
         env.ParseConfig('${PKGCONFIG} --cflags --libs cfitsio')
 
@@ -32,6 +32,8 @@ if not env['SBOX']:
                       LIBS=['giv-image']+env['LIBS'],
                       CPPPATH= env['CPPPATH']
                       )
+    else:
+        print('No cfitsio found')
 
     use_system_dcmtk = conf.CheckCXXHeader('dcmtk/ofstd/ofstd.h')
     print('use_system_dcmtk=',use_system_dcmtk)