Fixes bug #32

Author: joaopauloschuler

neural/neuraldatasetsv.pas

@@ -26,7 +26,9 @@ interface
 
 uses
   neuraldatasets, Classes, SysUtils, ExtCtrls, Graphics,
-  neuralvolume, neuralnetwork, StdCtrls;
+  neuralvolume, neuralnetwork, StdCtrls
+  {$IFNDEF FPC}, Windows{$ENDIF}
+  ;
 
 type
   TImageDynArr = array of TImage;

neural/neuralnetwork.pas

@@ -3688,49 +3688,49 @@ function THistoricalNets.AddParallelConvs(PointWiseConv: TNNetConvolutionClass;
   if (CopyInput) then
   begin
     aL[UnitCnt] := PreviousLayer;
-    UnitCnt += 1;
+    Inc(UnitCnt);
   end;
   if (maxPool>0) then
   begin
     LastLayer := AddLayerAfter( TNNetMaxPool.Create(3,1,0), PreviousLayer);
     aL[UnitCnt] := LocalAddBottleNeck(maxPool, LastLayer);
-    UnitCnt += 1;
+    Inc(UnitCnt);
   end;
   if (minPool>0) then
   begin
     LastLayer := AddLayerAfter( TNNetMinPool.Create(3,1,0), PreviousLayer);
     aL[UnitCnt] := LocalAddBottleNeck(minPool, LastLayer);
-    UnitCnt += 1;
+    Inc(UnitCnt);
   end;
   if (p11count>0) then
   begin
     LocalAddConv(p11count, 1, PreviousLayer);
     aL[UnitCnt] := GetLastLayer();
-    UnitCnt += 1;
+    Inc(UnitCnt);
   end;
   if (p33count>0) then
   begin
     LastLayer := PreviousLayer;
     if BottleNeck > 0 then LastLayer := LocalAddBottleNeck(BottleNeck, PreviousLayer);
     LocalAddConv(p33count, 3, LastLayer);
     aL[UnitCnt] := GetLastLayer();
-    UnitCnt += 1;
+    Inc(UnitCnt);
   end;
   if (p55count>0) then
   begin
     LastLayer := PreviousLayer;
     if BottleNeck > 0 then LastLayer := LocalAddBottleNeck(BottleNeck, PreviousLayer);
     LocalAddConv(p55count, 5, LastLayer);
     aL[UnitCnt] := GetLastLayer();
-    UnitCnt += 1;
+    Inc(UnitCnt);
   end;
   if (p77count>0) then
   begin
     LastLayer := PreviousLayer;
     if BottleNeck > 0 then LastLayer := LocalAddBottleNeck(BottleNeck, PreviousLayer);
     LocalAddConv(p77count, 7, LastLayer);
     aL[UnitCnt] := GetLastLayer();
-    UnitCnt += 1;
+    Inc(UnitCnt);
   end;
   if UnitCnt > 1 then
   begin

neural/neuralopencl.pas

@@ -46,12 +46,14 @@ interface
   TNeuralPChar     = PAnsiChar;
   csize_t          = NativeUInt;
   cl_bool          = TCL_bool;
+  cl_int           = TCL_int;
   cl_uint          = TCL_uint;
   cl_platform_id   = PCL_platform_id;
   cl_device_id     = PCL_device_id;
   cl_context       = PCL_context;
   cl_command_queue = PCL_command_queue;
   cl_program       = PCL_program;
+  cl_map_flags     = TCL_map_flags;
   cl_mem_flags     = TCL_mem_flags;
   cl_mem           = PCL_mem ;
   cl_kernel        = PCL_kernel;