Merge remote-tracking branch 'github/master'

Rubjerg · Feb 16, 2024 · 617e6d6 · 617e6d6
2 parents 845a6ce + 0c73a53
commit 617e6d6
Show file tree

Hide file tree

Showing 138 changed files with 725 additions and 424 deletions.
diff --git a/GraphvizWrapper/GraphvizWrapper.h b/GraphvizWrapper/GraphvizWrapper.h
@@ -159,6 +159,7 @@ extern "C" {
  __declspec(dllexport) char* echo_string(char* str);
  __declspec(dllexport) char* return_empty_string();
  __declspec(dllexport) char* return_hello();
+ __declspec(dllexport) char* return_copyright();
  __declspec(dllexport) int stackoverflow_repro();
  __declspec(dllexport) int missing_label_repro();
  __declspec(dllexport) int test_agread();

diff --git a/GraphvizWrapper/Test.cpp b/GraphvizWrapper/Test.cpp
@@ -30,6 +30,8 @@ char* echo_string(char* str) {
 char* return_empty_string() { return ""; }
 /// <returns>Ownership is not returned to the caller</returns>
 char* return_hello() { return "hello"; }
+/// <returns>Ownership is not returned to the caller</returns>
+char* return_copyright() { return u8"©"; }
 
 char* readFile(const std::string& filename) {
  std::ifstream file(filename, std::ios::binary | std::ios::ate);

diff --git a/GraphvizWrapper/graphvizfiles/Debug/acyclic.exe b/GraphvizWrapper/graphvizfiles/Debug/acyclic.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/bcomps.exe b/GraphvizWrapper/graphvizfiles/Debug/bcomps.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/ccomps.exe b/GraphvizWrapper/graphvizfiles/Debug/ccomps.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/cdt.dll b/GraphvizWrapper/graphvizfiles/Debug/cdt.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/cgraph++.dll b/GraphvizWrapper/graphvizfiles/Debug/cgraph++.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/cgraph.dll b/GraphvizWrapper/graphvizfiles/Debug/cgraph.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/circo.exe b/GraphvizWrapper/graphvizfiles/Debug/circo.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/cluster.exe b/GraphvizWrapper/graphvizfiles/Debug/cluster.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/config6 b/GraphvizWrapper/graphvizfiles/Debug/config6
@@ -38,6 +38,8 @@ gvplugin_core.dll core {
  }
  device {
  svg:svg 1
+ svgz:svg 1
+ svg_inline:svg 1
  }
  device {
  json:json 1
@@ -72,6 +74,7 @@ gvplugin_core.dll core {
  }
  render {
  svg 1
+ svg_inline 1
  }
  render {
  json 1

diff --git a/GraphvizWrapper/graphvizfiles/Debug/dijkstra.exe b/GraphvizWrapper/graphvizfiles/Debug/dijkstra.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/dot.exe b/GraphvizWrapper/graphvizfiles/Debug/dot.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/dot2gxl.exe b/GraphvizWrapper/graphvizfiles/Debug/dot2gxl.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/dot_builtins.exe b/GraphvizWrapper/graphvizfiles/Debug/dot_builtins.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/edgepaint.exe b/GraphvizWrapper/graphvizfiles/Debug/edgepaint.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/fdp.exe b/GraphvizWrapper/graphvizfiles/Debug/fdp.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gc.exe b/GraphvizWrapper/graphvizfiles/Debug/gc.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gml2gv.exe b/GraphvizWrapper/graphvizfiles/Debug/gml2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/graphml2gv.exe b/GraphvizWrapper/graphvizfiles/Debug/graphml2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gv2gml.exe b/GraphvizWrapper/graphvizfiles/Debug/gv2gml.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gv2gxl.exe b/GraphvizWrapper/graphvizfiles/Debug/gv2gxl.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvc++.dll b/GraphvizWrapper/graphvizfiles/Debug/gvc++.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvc.dll b/GraphvizWrapper/graphvizfiles/Debug/gvc.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvcolor.exe b/GraphvizWrapper/graphvizfiles/Debug/gvcolor.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvgen.exe b/GraphvizWrapper/graphvizfiles/Debug/gvgen.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvmap.exe b/GraphvizWrapper/graphvizfiles/Debug/gvmap.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvpack.exe b/GraphvizWrapper/graphvizfiles/Debug/gvpack.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_core.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_core.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_dot_layout.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_dot_layout.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_gdiplus.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_gdiplus.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_neato_layout.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_neato_layout.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_pango.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_pango.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_vt100.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_vt100.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvpr.exe b/GraphvizWrapper/graphvizfiles/Debug/gvpr.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gxl2dot.exe b/GraphvizWrapper/graphvizfiles/Debug/gxl2dot.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gxl2gv.exe b/GraphvizWrapper/graphvizfiles/Debug/gxl2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/mm2gv.exe b/GraphvizWrapper/graphvizfiles/Debug/mm2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/neato.exe b/GraphvizWrapper/graphvizfiles/Debug/neato.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/nop.exe b/GraphvizWrapper/graphvizfiles/Debug/nop.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/osage.exe b/GraphvizWrapper/graphvizfiles/Debug/osage.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/patchwork.exe b/GraphvizWrapper/graphvizfiles/Debug/patchwork.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/pathplan.dll b/GraphvizWrapper/graphvizfiles/Debug/pathplan.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/prune.exe b/GraphvizWrapper/graphvizfiles/Debug/prune.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/sccmap.exe b/GraphvizWrapper/graphvizfiles/Debug/sccmap.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/sfdp.exe b/GraphvizWrapper/graphvizfiles/Debug/sfdp.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/tred.exe b/GraphvizWrapper/graphvizfiles/Debug/tred.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/twopi.exe b/GraphvizWrapper/graphvizfiles/Debug/twopi.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/unflatten.exe b/GraphvizWrapper/graphvizfiles/Debug/unflatten.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/xdot.dll b/GraphvizWrapper/graphvizfiles/Debug/xdot.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/Pathplan.dll b/GraphvizWrapper/graphvizfiles/Release/Pathplan.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/acyclic.exe b/GraphvizWrapper/graphvizfiles/Release/acyclic.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/bcomps.exe b/GraphvizWrapper/graphvizfiles/Release/bcomps.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/ccomps.exe b/GraphvizWrapper/graphvizfiles/Release/ccomps.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/cdt.dll b/GraphvizWrapper/graphvizfiles/Release/cdt.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/cgraph++.dll b/GraphvizWrapper/graphvizfiles/Release/cgraph++.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/cgraph.dll b/GraphvizWrapper/graphvizfiles/Release/cgraph.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/circo.exe b/GraphvizWrapper/graphvizfiles/Release/circo.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/cluster.exe b/GraphvizWrapper/graphvizfiles/Release/cluster.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/config6 b/GraphvizWrapper/graphvizfiles/Release/config6
@@ -38,6 +38,8 @@ gvplugin_core.dll core {
  }
  device {
  svg:svg 1
+ svgz:svg 1
+ svg_inline:svg 1
  }
  device {
  json:json 1
@@ -72,6 +74,7 @@ gvplugin_core.dll core {
  }
  render {
  svg 1
+ svg_inline 1
  }
  render {
  json 1

diff --git a/GraphvizWrapper/graphvizfiles/Release/dijkstra.exe b/GraphvizWrapper/graphvizfiles/Release/dijkstra.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/dot.exe b/GraphvizWrapper/graphvizfiles/Release/dot.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/dot2gxl.exe b/GraphvizWrapper/graphvizfiles/Release/dot2gxl.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/dot_builtins.exe b/GraphvizWrapper/graphvizfiles/Release/dot_builtins.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/edgepaint.exe b/GraphvizWrapper/graphvizfiles/Release/edgepaint.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/fdp.exe b/GraphvizWrapper/graphvizfiles/Release/fdp.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gc.exe b/GraphvizWrapper/graphvizfiles/Release/gc.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gml2gv.exe b/GraphvizWrapper/graphvizfiles/Release/gml2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/graphml2gv.exe b/GraphvizWrapper/graphvizfiles/Release/graphml2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gv2gml.exe b/GraphvizWrapper/graphvizfiles/Release/gv2gml.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gv2gxl.exe b/GraphvizWrapper/graphvizfiles/Release/gv2gxl.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvc++.dll b/GraphvizWrapper/graphvizfiles/Release/gvc++.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvc.dll b/GraphvizWrapper/graphvizfiles/Release/gvc.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvcolor.exe b/GraphvizWrapper/graphvizfiles/Release/gvcolor.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvgen.exe b/GraphvizWrapper/graphvizfiles/Release/gvgen.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvmap.exe b/GraphvizWrapper/graphvizfiles/Release/gvmap.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvpack.exe b/GraphvizWrapper/graphvizfiles/Release/gvpack.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_core.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_core.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_dot_layout.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_dot_layout.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_gdiplus.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_gdiplus.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_neato_layout.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_neato_layout.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_pango.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_pango.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_vt100.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_vt100.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvpr.exe b/GraphvizWrapper/graphvizfiles/Release/gvpr.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gxl2dot.exe b/GraphvizWrapper/graphvizfiles/Release/gxl2dot.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gxl2gv.exe b/GraphvizWrapper/graphvizfiles/Release/gxl2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/mm2gv.exe b/GraphvizWrapper/graphvizfiles/Release/mm2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/neato.exe b/GraphvizWrapper/graphvizfiles/Release/neato.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/nop.exe b/GraphvizWrapper/graphvizfiles/Release/nop.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/osage.exe b/GraphvizWrapper/graphvizfiles/Release/osage.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/patchwork.exe b/GraphvizWrapper/graphvizfiles/Release/patchwork.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/prune.exe b/GraphvizWrapper/graphvizfiles/Release/prune.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/sccmap.exe b/GraphvizWrapper/graphvizfiles/Release/sccmap.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/sfdp.exe b/GraphvizWrapper/graphvizfiles/Release/sfdp.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/tred.exe b/GraphvizWrapper/graphvizfiles/Release/tred.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/twopi.exe b/GraphvizWrapper/graphvizfiles/Release/twopi.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/unflatten.exe b/GraphvizWrapper/graphvizfiles/Release/unflatten.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/xdot.dll b/GraphvizWrapper/graphvizfiles/Release/xdot.dll
diff --git a/GraphvizWrapper/include/cdt.h b/GraphvizWrapper/include/cdt.h
@@ -46,7 +46,6 @@ typedef struct _dtdata_s Dtdata_t;
 typedef struct _dt_s Dt_t;
 typedef struct _dt_s Dict_t; /* for libdict compatibility */
 typedef struct _dtstat_s Dtstat_t;
-typedef void* (*Dtmemory_f)(Dt_t*,void*,size_t,Dtdisc_t*);
 typedef void* (*Dtsearch_f)(Dt_t*,void*,int);
 typedef void* (*Dtmake_f)(void*,Dtdisc_t*);
 typedef void (*Dtfree_f)(void*,Dtdisc_t*);
@@ -93,23 +92,19 @@ struct _dtdisc_s
  Dtmake_f makef; /* object constructor */
  Dtfree_f freef; /* object destructor */
  Dtcompar_f comparf;/* to compare two objects */
- Dtmemory_f memoryf;/* to allocate/free memory */
 };
 
-#define DTDISC(dc, ky, sz, lk, mkf, frf, cmpf, memf) \
+#define DTDISC(dc, ky, sz, lk, mkf, frf, cmpf) \
  ( (dc)->key = (ky), (dc)->size = (sz), (dc)->link = (lk), \
  (dc)->makef = (mkf), (dc)->freef = (frf), \
- (dc)->comparf = (cmpf), \
- (dc)->memoryf = (memf) )
+ (dc)->comparf = (cmpf) )
 
 /* the dictionary structure itself */
 struct _dt_s
 { Dtsearch_f searchf;/* search function */
  Dtdisc_t* disc; /* method to manipulate objs */
  Dtdata_t* data; /* sharable data */
- Dtmemory_f memoryf;/* function to alloc/free memory */
  Dtmethod_t* meth; /* dictionary method */
- int type; /* type information */
  int nview; /* number of parent view dictionaries */
  Dt_t* view; /* next on viewpath */
  Dt_t* walk; /* dictionary being walked */
@@ -125,9 +120,6 @@ struct _dtstat_s
  size_t* dt_count; // counts of chains or levels by size
 };
 
-/* flag set if the last search operation actually found the object */
-#define DT_FOUND 0100000
-
 /* supported storage methods */
 #define DT_SET 0000001 /* set with unique elements */
 #define DT_OSET 0000004 /* ordered set (self-adjusting tree) */
@@ -194,17 +186,14 @@ CDT_API unsigned int dtstrhash(void*, int);
 
 #define dtfirst(d) (*(_DT(d)->searchf))((d),(void*)(0),DT_FIRST)
 #define dtnext(d,o) (*(_DT(d)->searchf))((d),(void*)(o),DT_NEXT)
-#define dtleast(d,o) (*(_DT(d)->searchf))((d),(void*)(o),DT_SEARCH|DT_NEXT)
 #define dtlast(d) (*(_DT(d)->searchf))((d),(void*)(0),DT_LAST)
 #define dtprev(d,o) (*(_DT(d)->searchf))((d),(void*)(o),DT_PREV)
-#define dtmost(d,o) (*(_DT(d)->searchf))((d),(void*)(o),DT_SEARCH|DT_PREV)
 #define dtsearch(d,o) (*(_DT(d)->searchf))((d),(void*)(o),DT_SEARCH)
 #define dtmatch(d,o) (*(_DT(d)->searchf))((d),(void*)(o),DT_MATCH)
 #define dtinsert(d,o) (*(_DT(d)->searchf))((d),(void*)(o),DT_INSERT)
 #define dtdelete(d,o) (*(_DT(d)->searchf))((d),(void*)(o),DT_DELETE)
 #define dtdetach(d,o) (*(_DT(d)->searchf))((d),(void*)(o),DT_DETACH)
 #define dtclear(d) (*(_DT(d)->searchf))((d),(void*)(0),DT_CLEAR)
-#define dtfound(d) (_DT(d)->type & DT_FOUND)
 
 #define DT_PRIME 17109811 /* 2#00000001 00000101 00010011 00110011 */