Attachment #195135 for bug #229517




--- src/XESCore/AptIO.cpp.orig	2018-07-04 20:00:56 UTC
+++ src/XESCore/AptIO.cpp
@@ -707,7 +707,7 @@ printf("read open_poly %i elements\n",in
 						{
 							//If we've loop through the whole array of ramp_ai_opperation_types
 							//we have a problem
-							if(ramp_operation_type_strings[i] == '\0')
+							if(ramp_operation_type_strings[i] == NULL)
 							{
 								ok = string("Error: ") + ramp_op_type_human_string + "is not a real Ramp Operation Type";
 								break;
@@ -990,7 +990,7 @@ printf("read open_poly %i elements\n",in
 				}
 
 				const char** str = truck_type_strings;
-				while(*str != '\0')
+				while(*str != NULL)
 				{
 					if (strcmp(truck_type_str.c_str(),*str)==0)
 					{
@@ -998,7 +998,7 @@ printf("read open_poly %i elements\n",in
 						break;
 					}
 					++str;
-					if (*str == '\0')
+					if (*str == NULL)
 					{
 						ok = ("Error: Truck type " + truck_type_str + " is not supported.");
 					}
@@ -1036,7 +1036,7 @@ printf("read open_poly %i elements\n",in
 				for (vector<string>::iterator itr = tokenized.begin(); itr != tokenized.end(); ++itr)
 				{
 					const char** str = truck_type_strings;
-					while (*str != '\0')
+					while (*str != NULL)
 					{
 						if (strcmp(itr->c_str(), *str) == 0)
 						{
@@ -1044,7 +1044,7 @@ printf("read open_poly %i elements\n",in
 							break;
 						}
 						++str;
-						if (*str == '\0')
+						if (*str == NULL)
 						{
 							ok = ("Error: Truck type " + *itr + " is not supported.");
 						}




--- src/XESCore/DEMDefs.h.orig	2018-07-04 21:09:41 UTC
+++ src/XESCore/DEMDefs.h
@@ -1217,14 +1217,30 @@ inline bool&	DEMMask::operator()(int x, 
 
 inline bool	DEMMask::operator()(int x, int y) const
 {
-	if (x < 0 || x >= mWidth || y < 0 || y >= mHeight) return DEM_NO_DATA;
+        bool b;
+	if (x < 0 || x >= mWidth || y < 0 || y >= mHeight)
+        {
+		b=true;
+		return b;
+        }
+        else
+        {	 
 	return mData[x + y * mWidth];
+	}
 }
 
-inline bool	DEMMask::get(int x, int y) const
+inline 	bool DEMMask::get(int x, int y) const
 {
-	if (x < 0 || x >= mWidth || y < 0 || y >= mHeight) return DEM_NO_DATA;
+        bool b;
+	if (x < 0 || x >= mWidth || y < 0 || y >= mHeight)
+	{
+		b=true;
+		return b;
+	}
+	else
+	{
 	return mData[x + y * mWidth];
+	}
 }
 
 inline void	DEMMask::set(int x, int y, bool v)

Line 0 Link Here

(-)files/patch-DEMIO.cpp (+11 lines)
	1	--- src/XESCore/DEMIO.cpp.orig 2018-07-04 19:58:36 UTC
	2	+++ src/XESCore/DEMIO.cpp
	3	@@ -1715,7 +1715,7 @@ bool WriteNormalWithHeight(const string&
	4	}
	5
	6	printf("Saving: %s\n", out_file.c_str());
	7	- if(WriteBitmapToPNG(&image, out_file.c_str(), NULL, NULL, 2.2f))
	8	+ if(WriteBitmapToPNG(&image, out_file.c_str(), NULL, 0, 2.2f))
	9	{
	10	DestroyBitmap(&image);
	11	return false;

Line 0 Link Here

(-)files/patch-DEMTables.cpp (+11 lines)
	1	--- src/XESCore/DEMTables.cpp.orig 2018-07-05 06:58:51 UTC
	2	+++ src/XESCore/DEMTables.cpp
	3	@@ -481,6 +481,8 @@ bool ReadNewTerrainInfo(const vector<str
	4	&info.composite_params[4],
	5	&info.composite_params[5]) != 23) return false;
	6	break;
	7	+ default:
	8	+ break;
	9	}
	10
	11	info.proj_angle = proj_Down;

Line 0 Link Here

(-)files/patch-DSF2Text.cpp (+11 lines)
	1	--- src/DSFTools/DSF2Text.cpp.orig 2018-07-15 03:25:39 UTC
	2	+++ src/DSFTools/DSF2Text.cpp
	3	@@ -379,7 +379,7 @@ static bool Text2DSFWithWriterAny(const
	4	{
	5	bool is_pipe = strcmp(inFileName, "-") == 0;
	6	FILE * fi = (!is_pipe) ? fopen(inFileName, "r") : stdin;
	7	- if (!fi) return NULL;
	8	+ if (!fi) return false;
	9
	10	int divisions = 8;
	11	float west = 999.0, south = 999.0, north = 999.0, east = 999.0;




--- src/Utils/FileUtils.cpp.orig	2018-07-05 04:33:27 UTC
+++ src/Utils/FileUtils.cpp
@@ -48,7 +48,7 @@
 static int desens_partial(DIR * dir, char * io_file)
 {
  struct dirent* de;
- while (de = readdir(dir))
+ while ((de = readdir(dir)) != NULL)
  {
   if (!strcasecmp(io_file, de->d_name))
   {
@@ -668,4 +668,4 @@ int FILE_compress_dir(const string& src_
 	
 	return r;
 	
-}
\ No newline at end of file
+}




--- src/GUI/GUI_Application.cpp.orig	2018-07-05 06:04:16 UTC
+++ src/GUI/GUI_Application.cpp
@@ -114,7 +114,7 @@ void GUI_QtMenu::showEvent( QShowEvent *
 {
     QList<QAction*> actlist = this->actions();
     QList<QAction*>::iterator it = actlist.begin();
-    for (it ; it != actlist.end(); ++it)
+    for (it = actlist.begin(); it != actlist.end(); ++it)
     {
         int cmd = (*it)->data().toInt();
         if (cmd)
@@ -136,7 +136,7 @@ void GUI_QtMenu::hideEvent( QHideEvent *
     // items and their shortcut-action while showevent .
     QList<QAction*> actlist = this->actions();
     QList<QAction*>::iterator it = actlist.begin();
-    for (it ; it != actlist.end(); ++it)
+    for (it  = actlist.begin() ; it != actlist.end(); ++it)
     {
         int cmd = (*it)->data().toInt();
         if (cmd)  (*it)->setEnabled(true);




--- src/GUI/GUI_Clipboard.cpp.orig	2018-07-04 22:36:05 UTC
+++ src/GUI/GUI_Clipboard.cpp
@@ -131,6 +131,7 @@ bool			GUI_Clipboard_HasClipType(GUI_Cli
 		return (IsClipboardFormatAvailable(sCITs[inType]));
 	#else
 		#warning implement clipboard typecheck for linux
+		return true;
 	#endif
 }
 
@@ -209,6 +210,7 @@ int				GUI_Clipboard_GetSize(GUI_ClipTyp
 
 	#else
 		#warning implement clipboard GetSize for linux
+		return true;
 	#endif
 }
 
@@ -240,6 +242,7 @@ bool			GUI_Clipboard_GetData(GUI_ClipTyp
 
 	#else
 		#warning implement clipboard getData() for linux
+		return true;
 	#endif
 }
 bool			GUI_Clipboard_SetData(int type_count, GUI_ClipType inTypes[], int sizes[], const void * ptrs[])
@@ -279,6 +282,7 @@ bool			GUI_Clipboard_SetData(int type_co
 
 	#else
 		#warning implement clipboard setData() for linux
+		return true;
 	#endif
 }
 
@@ -326,6 +330,7 @@ bool			GUI_SetTextToClipboard(const stri
      QClipboard* cb = QApplication::clipboard();
      QString tex = QString::fromUtf8(inText.c_str());
       cb->setText(tex);
+	return true;
 	#endif
 }
 




--- src/GUI/GUI_Packer.cpp.orig	2018-07-05 04:58:16 UTC
+++ src/GUI/GUI_Packer.cpp
@@ -85,6 +85,8 @@ void		GUI_Packer::PackPane(GUI_Pane * ch
 		subsize[2] = mPackArea[2];
 		subsize[3] = mPackArea[3];
 		break;
+	default:
+		break;
 	}
 	child->SetBounds(subsize);
 }
@@ -113,6 +115,8 @@ void		GUI_Packer::PackPaneToRight(GUI_Pa
 		subsize[1] = targetsize[3] - subsize[5];
 		mPackArea[3] = min(targetsize[1], subsize[1]);
 		break;
+	default:
+		break;
 	}
 	child->SetBounds(subsize);
 }




--- src/GUI/GUI_TextTable.cpp.orig	2018-07-05 05:31:25 UTC
+++ src/GUI/GUI_TextTable.cpp
@@ -295,6 +295,8 @@ void		GUI_TextTable::CellDraw	 (int cell
 	case gui_Cell_CheckBox:
 		c.text_val = "";
 		break;
+	default:
+		break;
 	}
 	
 	if(c.can_delete)
@@ -472,6 +474,8 @@ void		GUI_TextTable::CellDraw	 (int cell
 		glEnd();
 		glLineWidth(1);
 		break;
+	default:
+		break;
 	}
 	glColor4fv(mColorGridlines);
 	//-----------------------------------------------------------------
@@ -765,6 +769,8 @@ int			GUI_TextTable::CellMouseDown(int c
 			mEditInfo.content_type = gui_Cell_None;
 		}
 		break;
+	default:
+		break;
 	}
 	return 1;
 }
@@ -822,6 +828,8 @@ void		GUI_TextTable::CellMouseDrag(int c
 			BroadcastMessage(GUI_TABLE_CONTENT_CHANGED, 0);
 		}
 		break;
+	default:
+		break;
 	}
 }
 
@@ -881,6 +889,8 @@ void		GUI_TextTable::CellMouseUp  (int c
 			BroadcastMessage(GUI_TABLE_CONTENT_CHANGED, 0);
 		}
 		break;
+	default:
+		break;
 	}
 	if (!HasEdit())
 	{
@@ -977,6 +987,8 @@ GUI_DragOperation	GUI_TextTable::CellDra
 				if (mLastOp == gui_Drag_None)	if ((mLastOp = mContent->CanDropBetweenRows(cell_y + (mDragPart == drag_IntoOrHigher ? 1 : 0), drag, allowed, recommended)) != gui_Drag_None)
 													mDragDest = mDragPart == drag_IntoOrHigher ? gui_Insert_Top : gui_Insert_Bottom;
 				break;
+			default:
+				break;
 			}
 		}
 		else
@@ -1008,6 +1020,8 @@ GUI_DragOperation	GUI_TextTable::CellDra
 				if (mLastOp == gui_Drag_None)	if ((mLastOp = mContent->CanDropBetweenColumns(cell_x + (mDragPart == drag_IntoOrHigher ? 1 : 0), drag, allowed, recommended)) != gui_Drag_None)
 													mDragDest = mDragPart == drag_IntoOrHigher ? gui_Insert_Right : gui_Insert_Left;
 				break;
+			default:
+				break;
 			}
 		}
 		else
@@ -1280,6 +1294,8 @@ int			GUI_TextTable::TerminateEdit(bool 
 			case gui_Cell_Double:
 				mEditInfo.double_val = atof(mEditInfo.text_val.c_str());
 				break;
+			default:
+				break;
 			}
 			mContent->AcceptEdit(mClickCellX, mClickCellY, mEditInfo, in_all);
 		}
@@ -1404,6 +1420,8 @@ int			GUI_TextTable::HandleKeyPress(uint
 			}
 		}
 		break;
+	default:
+		break;
 	}
 
 	if(inKey == GUI_KEY_TAB && HasEdit() && mContent)

Line 0 Link Here

(-)files/patch-RF__Main.cpp (+11 lines)
	1	--- src/RenderFarmUI/RF_Main.cpp.orig 2018-07-04 20:42:21 UTC
	2	+++ src/RenderFarmUI/RF_Main.cpp
	3	@@ -303,7 +303,7 @@ static GISTool_RegCmd_t sUtilCmds[] = {
	4
	5
	6
	7	-static int fifo = NULL;
	8	+static int fifo = 0;
	9
	10	static float CheckFifo(void)
	11	{

Line 0 Link Here

(-)files/patch-RF__Selection.cpp (+11 lines)
	1	--- src/RenderFarmUI/RF_Selection.cpp.orig 2018-07-05 20:35:32 UTC
	2	+++ src/RenderFarmUI/RF_Selection.cpp
	3	@@ -40,7 +40,7 @@ void RF_SetSelectionMode(int mode)
	4	if (mode != rf_Select_Face && ! gFaceSelection.empty()) { gFaceSelection.clear(); cleared = 1; }
	5	if (mode != rf_Select_PointFeatures && !gPointFeatureSelection.empty()) { gPointFeatureSelection.clear(); cleared = 1; }
	6
	7	- RF_Notifiable::Notify(rf_Cat_Selection, rf_Msg_SelectionModeChanged, (void *) cleared);
	8	+ RF_Notifiable::Notify(rf_Cat_Selection, rf_Msg_SelectionModeChanged, (void *)(size_t) cleared);
	9	}
	10
	11

Line 0 Link Here

(-)files/patch-WED__ATCLayer.cpp (+11 lines)
	1	--- src/WEDMap/WED_ATCLayer.cpp.orig 2018-07-05 15:08:08 UTC
	2	+++ src/WEDMap/WED_ATCLayer.cpp
	3	@@ -131,7 +131,7 @@ bool WED_ATCLayer::DrawEntityStructure
	4	bool road = seg->AllowTrucks() && !seg->AllowAircraft();
	5	bool one_way = seg->IsOneway();
	6
	7	- int mtr1 = 5, mtr2 = 10;
	8	+ double mtr1 = 5, mtr2 = 10;
	9	switch(icao_width) {
	10	case width_A: mtr1 = 4.5; mtr2 = 15.0; break;
	11	case width_B: mtr1 = 6.0; mtr2 = 24.0; break;




--- src/WEDWindows/WED_AboutBox.cpp.orig	2018-07-08 15:08:31 UTC
+++ src/WEDWindows/WED_AboutBox.cpp
@@ -79,8 +79,7 @@ void		WED_AboutBox::Draw(GUI_GraphState 
 	}
 
 	char buf[1024];
-
-	sprintf(buf,"WorldEditor " WED_VERSION_STRING ", compiled on "__DATE__" "__TIME__);
+	 sprintf( buf, "WorldEditor " WED_VERSION_STRING ", compiled on " "%s %s", __DATE__, __TIME__);
 
 	GUI_FontDrawScaled(state, font_UI_Basic, color,
 		bounds[0],




--- src/WEDImportExport/WED_AptIE.cpp.orig	2018-07-05 06:19:23 UTC
+++ src/WEDImportExport/WED_AptIE.cpp
@@ -309,7 +309,7 @@ void	AptExportRecursive(WED_Thing * what
 	 * a bogus export. */
 	if(dynamic_cast<WED_OverlayImage *>(what)) return;
 
-	if (apt = dynamic_cast<WED_Airport *>(what))
+	if ((apt = dynamic_cast<WED_Airport *>(what)) != NULL)
 	{
 		apts.push_back(AptInfo_t());
 		apt->Export(apts.back());
@@ -338,11 +338,11 @@ void	AptExportRecursive(WED_Thing * what
 		
 #endif
 	}
-	else if (bcn = dynamic_cast<WED_AirportBeacon *>(what))
+	else if ((bcn = dynamic_cast<WED_AirportBeacon *>(what)) != NULL)
 	{
 		bcn->Export(apts.back().beacon);
 	}
-	else if (bou = dynamic_cast<WED_AirportBoundary *>(what))
+	else if ((bou == dynamic_cast<WED_AirportBoundary *>(what)) != 0)
 	{
 		apts.back().boundaries.push_back(AptBoundary_t());
 		bou->Export(apts.back().boundaries.back());
@@ -357,44 +357,44 @@ void	AptExportRecursive(WED_Thing * what
 		return;	// bail out - we already got the children.
 
 	}
-	else if (cha = dynamic_cast<WED_AirportChain *>(what))
+	else if ((cha = dynamic_cast<WED_AirportChain *>(what)) != NULL)
 	{
 		apts.back().lines.push_back(AptMarking_t());
 		cha->Export(apts.back().lines.back());
 		ExportLinearPath(cha, apts.back().lines.back().area);
 		return;	// don't waste time with nodes - for speed
 	}
-	else if (sgn = dynamic_cast<WED_AirportSign *>(what))
+	else if ((sgn = dynamic_cast<WED_AirportSign *>(what)) != NULL)
 	{
 		apts.back().signs.push_back(AptSign_t());
 		sgn->Export(apts.back().signs.back());
 	}
-	else if (hel = dynamic_cast<WED_Helipad *>(what))
+	else if ((hel = dynamic_cast<WED_Helipad *>(what)) != NULL)
 	{
 		apts.back().helipads.push_back(AptHelipad_t());
 		hel->Export(apts.back().helipads.back());
 	}
-	else if (lit = dynamic_cast<WED_LightFixture *>(what))
+	else if ((lit = dynamic_cast<WED_LightFixture *>(what)) != NULL)
 	{
 		apts.back().lights.push_back(AptLight_t());
 		lit->Export(apts.back().lights.back());
 	}
-	else if (ram = dynamic_cast<WED_RampPosition *>(what))
+	else if ((ram = dynamic_cast<WED_RampPosition *>(what)) != NULL)
 	{
 		apts.back().gates.push_back(AptGate_t());
 		ram->Export(apts.back().gates.back());
 	}
-	else if (rwy = dynamic_cast<WED_Runway *>(what))
+	else if ((rwy = dynamic_cast<WED_Runway *>(what)) != NULL)
 	{
 		apts.back().runways.push_back(AptRunway_t());
 		rwy->Export(apts.back().runways.back());
 	}
-	else if (sea = dynamic_cast<WED_Sealane *>(what))
+	else if ((sea = dynamic_cast<WED_Sealane *>(what)) != NULL)
 	{
 		apts.back().sealanes.push_back(AptSealane_t());
 		sea->Export(apts.back().sealanes.back());
 	}
-	else if (tax = dynamic_cast<WED_Taxiway *>(what))
+	else if ((tax = dynamic_cast<WED_Taxiway *>(what)) != NULL)
 	{
 		apts.back().taxiways.push_back(AptTaxiway_t());
 		tax->Export(apts.back().taxiways.back());
@@ -409,47 +409,47 @@ void	AptExportRecursive(WED_Thing * what
 		}
 		return; // bail out - we already got the children
 	}
-	else if (twr = dynamic_cast<WED_TowerViewpoint *>(what))
+	else if ((twr = dynamic_cast<WED_TowerViewpoint *>(what)) != NULL)
 	{
 		twr->Export(apts.back().tower);
 	}
-	else if (win = dynamic_cast<WED_Windsock *>(what))
+	else if ((win = dynamic_cast<WED_Windsock *>(what)) != NULL)
 	{
 		apts.back().windsocks.push_back(AptWindsock_t());
 		win->Export(apts.back().windsocks.back());
 	}
-	else if (atc = dynamic_cast<WED_ATCFrequency *>(what))
+	else if ((atc = dynamic_cast<WED_ATCFrequency *>(what)) != NULL )
 	{
 		apts.back().atc.push_back(AptATCFreq_t());
 		atc->Export(apts.back().atc.back());
 	}
 #if AIRPORT_ROUTING	
-	else if(flw = dynamic_cast<WED_ATCFlow *>(what))
+	else if((flw = dynamic_cast<WED_ATCFlow *>(what)) != NULL)
 	{
 		apts.back().flows.push_back(AptFlow_t());
 		flw->Export(apts.back().flows.back());
 	}
-	else if(use = dynamic_cast<WED_ATCRunwayUse *>(what))
+	else if((use = dynamic_cast<WED_ATCRunwayUse *>(what)) != NULL)
 	{
 		apts.back().flows.back().runway_rules.push_back(AptRunwayRule_t());
 		use->Export(apts.back().flows.back().runway_rules.back());
 	}
-	else if(tim = dynamic_cast<WED_ATCTimeRule *>(what))
+	else if((tim = dynamic_cast<WED_ATCTimeRule *>(what)) != NULL)
 	{
 		apts.back().flows.back().time_rules.push_back(AptTimeRule_t());
 		tim->Export(apts.back().flows.back().time_rules.back());
 	}
-	else if(wnd = dynamic_cast<WED_ATCWindRule *>(what))
+	else if((wnd = dynamic_cast<WED_ATCWindRule *>(what)) != NULL)
 	{
 		apts.back().flows.back().wind_rules.push_back(AptWindRule_t());
 		wnd->Export(apts.back().flows.back().wind_rules.back());
 	}
-	else if(trk = dynamic_cast<WED_TruckParkingLocation*>(what))
+	else if((trk = dynamic_cast<WED_TruckParkingLocation*>(what)) != NULL)
 	{
 		apts.back().truck_parking.push_back(AptTruckParking_t());
 		trk->Export(apts.back().truck_parking.back());
 	}
-	else if(dst = dynamic_cast<WED_TruckDestination*>(what))
+	else if((dst == dynamic_cast<WED_TruckDestination*>(what)) != 0)
 	{
 		apts.back().truck_destinations.push_back(AptTruckDestination_t());
 		dst->Export(apts.back().truck_destinations.back());




--- src/WEDMap/WED_CreateEdgeTool.cpp.orig	2018-07-05 09:49:45 UTC
+++ src/WEDMap/WED_CreateEdgeTool.cpp
@@ -413,6 +413,8 @@ void WED_CreateEdgeTool::FindNear(WED_Th
 				for(int n = 0; n < c->GetNumEntities(); ++n)
 					FindNear(NULL,c->GetNthEntity(n), filter, loc, out_thing, out_dsq);
 			}
+		default:
+			break;
 		}
 	}
 	else
@@ -485,6 +487,8 @@ void WED_CreateEdgeTool::FindNearP2S(WED
 				for(int n = 0; n < c->GetNumEntities(); ++n)
 					FindNearP2S(NULL,c->GetNthEntity(n), filter, loc, out_thing, out_dsq);
 			}
+		default:
+			break;
 		}
 	}
 	else




--- src/WEDMap/WED_CreatePolygonTool.cpp.orig	2018-07-05 13:24:15 UTC
+++ src/WEDMap/WED_CreatePolygonTool.cpp
@@ -350,12 +350,18 @@ void	WED_CreatePolygonTool::AcceptPath(
 		pol_info_t info;
 
 		if(rmgr->GetPol(mResource.value, info))
+		{
 			if (!info.mUVBox.is_null())
+			{
 				dpol->SetSubTexture(info.mUVBox);
+			}
 			else
+			{
 				dpol->SetSubTexture(Bbox2(0,0,1,1));
-
+			}
 		dpol->Redrape();
+		}
+		
 	}
 	else if (mType == create_Hole && host->GetClass() == WED_DrapedOrthophoto::sClass)   // holes in orthos also need UV map set
 		dynamic_cast <WED_DrapedOrthophoto *> (host)->Redrape();

Line 0 Link Here

(-)files/patch-WED__FileCache.cpp (+11 lines)
	1	--- src/WEDFileCache/WED_FileCache.cpp.orig 2018-07-04 19:57:32 UTC
	2	+++ src/WEDFileCache/WED_FileCache.cpp
	3	@@ -157,7 +157,7 @@ void CACHE_FileCacheInitializer::init()
	4	}
	5	else
	6	{
	7	- paired_files.push_back(make_pair<string,string>(files[i], files[i+1]));
	8	+ paired_files.push_back(make_pair(files[i], files[i+1]));
	9	i += 2;
	10	}
	11	}

Line 0 Link Here

(-)files/patch-WED__GatewayExport.cpp (+11 lines)
	1	--- src/WEDImportExport/WED_GatewayExport.cpp.orig 2018-07-07 14:06:35 UTC
	2	+++ src/WEDImportExport/WED_GatewayExport.cpp
	3	@@ -572,7 +572,7 @@ void WED_GatewayExportDialog::Submit()
	4	vector<char> temp_chars(temp_folder.begin(),temp_folder.end());
	5	temp_chars.push_back(0);
	6
	7	- if(!mktemp(&temp_chars[0]))
	8	+ if(!mkstemp(&temp_chars[0]))
	9	{
	10	gExportTarget = old_target;
	11	return;




--- src/WEDWindows/WED_GroupCommands.cpp.orig	2018-07-05 04:46:46 UTC
+++ src/WEDWindows/WED_GroupCommands.cpp
@@ -1091,7 +1091,7 @@ set<WED_GISEdge*> do_select_crossing(vec
 			Bezier2 b1, b2;
 			bool isb1, isb2;
 
-			if (isb1 = ii->GetSide(gis_Geo, 0, s1, b1))
+			if ((isb1 == ii->GetSide(gis_Geo, 0, s1, b1)) == true)
 			{
 				s1.p1 = b1.p1;
 				s1.p2 = b1.p2;
@@ -1102,7 +1102,7 @@ set<WED_GISEdge*> do_select_crossing(vec
 				b1.c2 = b1.p2;
 			}
 
-			if (isb2 = jj->GetSide(gis_Geo, 0, s2, b2))
+			if ((isb2 == jj->GetSide(gis_Geo, 0, s2, b2)) == true)
 			{
 				s2.p1 = b2.p1;
 				s2.p2 = b2.p2;




--- src/WEDMap/WED_HandleToolBase.cpp.orig	2018-07-05 13:11:22 UTC
+++ src/WEDMap/WED_HandleToolBase.cpp
@@ -513,6 +513,8 @@ int		WED_HandleToolBase::ProcessSelectio
 		if (pt_sel && entity->PtOnFrame(gis_Geo,psel, frame_dist))  { result.insert(entity); return 1; }
 
 		break;
+	default:
+		break;
 	}
 	return 0;
 }
@@ -535,6 +537,8 @@ void		WED_HandleToolBase::HandleClickDra
 			case drag_Handles:				mHandles->ControlsHandlesBy(mHandleEntity,	mHandleIndex,	delta, mTrackPoint);	break;
 			case drag_Links:				mHandles->ControlsLinksBy(mHandleEntity,	mHandleIndex,	delta, mTrackPoint);	break;
 			case drag_Ent:					mHandles->ControlsMoveBy(mHandleEntity,						delta, mTrackPoint);	break;
+		default:
+			break;
 			}
 		}
 		break;
@@ -592,6 +596,8 @@ void		WED_HandleToolBase::HandleClickDra
 			}
 		}
 		break;
+		default:
+			break;
 	}
 }
 
@@ -684,6 +690,8 @@ void		WED_HandleToolBase::DrawStructure	
 					case link_Ghost:		glColor4fv(WED_Color_RGBA(wed_GhostLink));		break;
 					case link_BezierCtrl:	glColor4fv(WED_Color_RGBA(wed_ControlLink));	break;
 					case link_Marquee:		glColor4fv(WED_Color_RGBA(wed_Marquee));		break;
+					default:
+						break;
 					}
 					if (ControlLinkToCurve(mHandles,eid,l,b,s,GetZoomer()))
 					{
@@ -752,6 +760,8 @@ void		WED_HandleToolBase::DrawStructure	
 				case handle_Arrow:			GUI_PlotIcon(g,"handle_arrowhead.png", scrpt.x(),scrpt.y(),atan2(orient.dx,orient.dy) * RAD_TO_DEG,1.0);	break;
 				case handle_RotateHead:
 				case handle_Rotate:			GUI_PlotIcon(g,"handle_rotatehead.png", scrpt.x(),scrpt.y(),atan2(orient.dx,orient.dy) * RAD_TO_DEG,1.0);	break;
+			default:
+				break;
 				}
 			}
 		}




--- src/WEDCore/WED_Package.cpp.orig	2018-07-05 05:01:58 UTC
+++ src/WEDCore/WED_Package.cpp
@@ -103,11 +103,11 @@ WED_Package::WED_Package(const char * in
 		string wed_folder = mPackageBase + EDIT_DIR_NAME + EARTH_DIR_NAME;
 		string earth_folder = mPackageBase + EARTH_DIR_NAME;
 		int err;
-		if (err = FILE_make_dir_exist(mPackageBase.c_str()))
+		if ((err = FILE_make_dir_exist(mPackageBase.c_str())) == true)
 			WED_ThrowPrintf("Unable to create directory %s: %d", mPackageBase.c_str(), err);
-		if (err = FILE_make_dir_exist(wed_folder.c_str()))
+		if ((err = FILE_make_dir_exist(wed_folder.c_str())) == true)
 			WED_ThrowPrintf("Unable to create directory %s: %d", wed_folder.c_str(), err);
-		if (err = FILE_make_dir_exist(earth_folder.c_str()))
+		if ((err = FILE_make_dir_exist(earth_folder.c_str())) == true)
 			WED_ThrowPrintf("Unable to create directory %s: %d", earth_folder.c_str(), err);
 	}
 
@@ -174,7 +174,7 @@ WED_Document *	WED_Package::OpenTile(int
 	sprintf(partial, DIR_STR "%+03d%+04d", latlon_bucket(lat),latlon_bucket(lon));
 	string parent = mPackageBase + EDIT_DIR_NAME + EARTH_DIR_NAME + partial;
 	int err;
-	if (err = FILE_make_dir_exist(parent.c_str()))
+	if ((err = FILE_make_dir_exist(parent.c_str())) == true)
 		WED_ThrowPrintf("Unable to open create %s: %d", parent.c_str(), err);
 
 	WED_Document * tile = new WED_Document(path, bounds);




--- src/WEDMap/WED_PreviewLayer.cpp.orig	2018-07-05 13:03:46 UTC
+++ src/WEDMap/WED_PreviewLayer.cpp
@@ -362,9 +362,9 @@ struct	preview_runway : public WED_Previ
 
 		// First, transform our geometry.
 						rwy->GetCorners(gis_Geo,corners);			zoomer->LLToPixelv(corners, corners, 4);
-		if (has_blas1 = rwy->GetCornersBlas1(blas1))				zoomer->LLToPixelv(blas1, blas1, 4);
-		if (has_blas2 = rwy->GetCornersBlas2(blas2))				zoomer->LLToPixelv(blas2, blas2, 4);
-		if (has_shoulders = rwy->GetCornersShoulders(shoulders))	zoomer->LLToPixelv(shoulders, shoulders, 8);
+		if (has_blas1 == rwy->GetCornersBlas1(blas1))				zoomer->LLToPixelv(blas1, blas1, 4);
+		if (has_blas2 == rwy->GetCornersBlas2(blas2))				zoomer->LLToPixelv(blas2, blas2, 4);
+		if (has_shoulders == rwy->GetCornersShoulders(shoulders))	zoomer->LLToPixelv(shoulders, shoulders, 8);
 
 		if (mPavementAlpha > 0.0f)
 		{




--- src/WEDMap/WED_StructureLayer.cpp.orig	2018-07-05 12:13:38 UTC
+++ src/WEDMap/WED_StructureLayer.cpp
@@ -214,11 +214,11 @@ bool		WED_StructureLayer::DrawEntityStru
 
 		// First, transform our geometry.
 						rwy->GetCorners(gis_Geo,corners);			GetZoomer()->LLToPixelv(corners, corners, 4);
-		if (has_blas1 = rwy->GetCornersBlas1(blas1))				GetZoomer()->LLToPixelv(blas1, blas1, 4);
-		if (has_blas2 = rwy->GetCornersBlas2(blas2))				GetZoomer()->LLToPixelv(blas2, blas2, 4);
-		if (has_disp1 = rwy->GetCornersDisp1(disp1))				GetZoomer()->LLToPixelv(disp1, disp1, 4);
-		if (has_disp2 = rwy->GetCornersDisp2(disp2))				GetZoomer()->LLToPixelv(disp2, disp2, 4);
-		if (has_shoulders = rwy->GetCornersShoulders(shoulders))	GetZoomer()->LLToPixelv(shoulders, shoulders, 8);
+		if (has_blas1 == rwy->GetCornersBlas1(blas1))				GetZoomer()->LLToPixelv(blas1, blas1, 4);
+		if ((has_blas2 = rwy->GetCornersBlas2(blas2)) == true)				GetZoomer()->LLToPixelv(blas2, blas2, 4);
+		if ((has_disp1 = rwy->GetCornersDisp1(disp1)) == true)			GetZoomer()->LLToPixelv(disp1, disp1, 4);
+		if ((has_disp2 == rwy->GetCornersDisp2(disp2)) == true)				GetZoomer()->LLToPixelv(disp2, disp2, 4);
+		if ((has_shoulders == rwy->GetCornersShoulders(shoulders)) ==true)	GetZoomer()->LLToPixelv(shoulders, shoulders, 8);
 
 		//  "Outline" geometry
 		glColor4fv(WED_Color_RGBA(struct_color));
@@ -593,6 +593,8 @@ bool		WED_StructureLayer::DrawEntityStru
 				this->DrawEntityStructure(inCurrent,poly->GetNthHole(c),g,selected);
 		}
 		break;
+		default:
+			break;
 	}
 	return true;
 }
@@ -707,6 +709,8 @@ bool		WED_StructureLayer::DrawEntityVisu
 			}
 		}
 		break;
+	default:
+		break;
 	}
 	return true;
 }




--- src/WEDTCE/WED_TCEVertexTool.cpp.orig	2018-07-07 14:23:29 UTC
+++ src/WEDTCE/WED_TCEVertexTool.cpp
@@ -156,6 +156,8 @@ void		WED_TCEVertexTool::GetNthControlHa
 			}
 		}
 		break;
+		default:
+			break;
 	}
 }
 
@@ -329,6 +331,8 @@ void		WED_TCEVertexTool::ControlsHandles
 			}
 		}
 		break;
+		default:
+			break;
 	}
 
 	// now that we used TCE to modify the UVmaping, update UVbounds
@@ -355,6 +359,8 @@ void		WED_TCEVertexTool::ControlsLinksBy
 			p2->GetLocation(gis_UV,p);			p += delta;			p2->SetLocation(gis_UV,p);
 		}
 		break;
+		default:
+			break;
 	}
 	// now that we used TCE to modify the UVmaping, update UVbounds
 	updateUVbounds(who);
@@ -413,6 +419,8 @@ void	WED_TCEVertexTool::SyncRecurse(IGIS
 		if((c = dynamic_cast<IGISComposite *>(who)) != NULL)
 		for(int n = 0; n < c->GetNumEntities(); ++n)
 			SyncRecurse(c->GetNthEntity(n),sel);
+	default:
+		break;
 	}
 }
 




--- src/WEDMap/WED_VertexTool.cpp.orig	2018-07-07 01:19:06 UTC
+++ src/WEDMap/WED_VertexTool.cpp
@@ -182,6 +182,8 @@ int		WED_VertexTool::CountControlHandles
 		e = dynamic_cast<IGISEdge *>(en);
 		DebugAssert(e);
 		return e ? 4 : 0;
+	default:
+		break;
 	}
 	return 0;
 }
@@ -460,6 +462,8 @@ void	WED_VertexTool::GetNthControlHandle
 			return;
 		}
 		break;
+	default:
+		break;
 	}	
 	DebugAssert(!"Cast failed!");
 	return;
@@ -497,6 +501,8 @@ int		WED_VertexTool::GetLinks		    (intp
 	case gis_Edge:
 		e = dynamic_cast<IGISEdge*>(en);
 		return e ? 3 : 0;
+	default:
+		break;
 	}
 	return 0;
 }
@@ -533,6 +539,8 @@ void	WED_VertexTool::GetNthLinkInfo		(in
 			if(ltype) *ltype = link_BezierCtrl;
 			if(active) *active = 0;
 		}
+	default:
+		break;
 	}
 }
 
@@ -558,6 +566,8 @@ int		WED_VertexTool::GetNthLinkSource   
 		case 1: return 0;
 		case 2: return 3;
 		}
+	default:
+		break;
 	}
 	return 0;
 }
@@ -575,6 +585,8 @@ int		WED_VertexTool::GetNthLinkSourceCtl
 		case 1: return 0;
 		case 2: return 3;
 		}
+	default:
+		break;
 	}
 	return -1;
 }
@@ -599,6 +611,8 @@ int		WED_VertexTool::GetNthLinkTarget   
 		case 1: return 1;
 		case 2: return 2;
 		}
+	default:
+		break;
 	}
 	return 0;
 }
@@ -616,6 +630,8 @@ int		WED_VertexTool::GetNthLinkTargetCtl
 		case 1: return 1;
 		case 2: return 2;
 		}
+	default:
+		break;
 	}
 	return -1;
 }
@@ -696,6 +712,8 @@ void	WED_VertexTool::ControlsHandlesBy(i
 		case 10:	rwy->SetDisp1(rwy->GetDisp1() + axis.dot(delta_m));	break;
 		case 11:	rwy->SetDisp2(rwy->GetDisp2() + axis.dot(delta_m));	break;
 		case 12:	rwy->SetBlas2(rwy->GetBlas2() + axis.dot(delta_m));	break;
+		default:
+			break;
 		}
 
 		io_pt += delta;
@@ -870,6 +888,8 @@ void	WED_VertexTool::ControlsHandlesBy(i
 			}
 			return;
 		}
+	default:
+		break;
 	}
 	DebugAssert(!"Cast failed!");
 	return;
@@ -1058,6 +1078,8 @@ void		WED_VertexTool::AddEntityRecursive
 				AddEntityRecursive(cmp->GetNthEntity(n),vis_area);
 		}
 		break;
+	default:
+		break;
 	}
 }
 
@@ -1147,6 +1169,8 @@ void		WED_VertexTool::AddSnapPointRecurs
 				AddSnapPointRecursive(cmp->GetNthEntity(n),vis_area, sel);
 		}
 		break;
+	default:
+		break;
 	}
 }
 




--- libs/Makefile.orig	2018-07-06 23:45:40 UTC
+++ libs/Makefile
@@ -111,6 +111,10 @@ ifeq ($(PLATFORM), Linux)
 	PLAT_LINUX := Yes
 	VIS	:= -fvisibility=hidden
 endif

 
 # boost
 ARCHIVE_BOOST		:= boost_$(VER_BOOST).tar.gz
@@ -368,9 +372,7 @@ libtiff libproj libgeotiff libsqlite lib
 libexpat libgmp libmpfr libssl libcurl libjasper
 
 all: ./local$(MULTI_SUFFIX)/.xpt_libs

 	@touch ./local$(MULTI_SUFFIX)/.xpt_libs
 	
 clean:
@@ -629,11 +631,7 @@ libsquish: ./local$(MULTI_SUFFIX)/lib/.x
 
 
 libcgal: ./local$(MULTI_SUFFIX)/lib/.xpt_libcgal

 	@echo "building libcgal..."
 	@-mkdir -p "./local$(MULTI_SUFFIX)/include"
 	@-mkdir -p "./local$(MULTI_SUFFIX)/lib"
@@ -663,24 +661,17 @@ ifdef PLAT_DARWIN
 endif
 ifdef PLAT_LINUX
 	@cd "CGAL-$(VER_CGAL)" && \

 endif
 ifdef PLAT_MINGW
 	@cd "CGAL-$(VER_CGAL)" && \
@@ -702,6 +693,12 @@ ifdef PLAT_MINGW
 	-DWITH_CGAL_Qt4=OFF $(BE_QUIET) && \
 	make $(BE_QUIET) && make install $(BE_QUIET)
 endif
+	sed -i "" 's|static_cast<limb2>(-1) << sizeof_limb|static_cast<limb2>(-1U  << sizeof_limb)|g' \
+	./local/include/CGAL/MP_Float.h
+#	Placeholder
+#	./local/include/CGAL/Compact_container.h
+	sed -i "" 's|return \&\*rhs == NULL;|return rhs.operator->() == NULL;|'\
+        ./local/include/CGAL/Compact_container.h
 	@-rm -rf CGAL-$(VER_CGAL)
 	@touch $@
 

Line 0 Link Here

(-)files/patch-obj8__export.cpp (+29 lines)
	1	--- src/AC3DPlugins/obj8_export.cpp.orig 2018-07-05 08:55:46 UTC
	2	+++ src/AC3DPlugins/obj8_export.cpp
	3	@@ -825,8 +825,8 @@ void ag_output_polygon(FILE * fi, Surfac
	4
	5	if (p1->y == p2->y &&
	6	p1->y == p3->y &&
	7	- p1->y == p4->y)
	8	- if(s->normal.y > 0.0)
	9	+ p1->y == p4->y) {
	10	+ if(s->normal.y > 0.0) {
	11
	12	if(p1->y < 0.0)
	13	{
	14	@@ -849,6 +849,8 @@ void ag_output_polygon(FILE * fi, Surfac
	15	p3->x + x_off,z_off + p3->z,
	16	p4->x + x_off,z_off + p4->z);
	17	}
	18	+ }
	19	+ }
	20	}
	21	}
	22
	23	@@ -896,4 +898,4 @@ int do_ag_save(char * fname, ACObject *
	24
	25	fclose(fi);
	26	return 1;
	27	-}
	28	\ No newline at end of file
	29	+}

Line 0 Link Here

(-)files/patch-obj8__import.cpp (+11 lines)
	1	--- src/AC3DPlugins/obj8_import.cpp.orig 2018-07-05 08:49:54 UTC
	2	+++ src/AC3DPlugins/obj8_import.cpp
	3	@@ -503,7 +503,7 @@ ACObject * do_obj8_load(char *filename)
	4	panel_get_import_scaling(panel_id,last_reg,&s_mul,&t_mul,&s_add,&t_add);
	5	break;
	6	case attr_No_Blend:
	7	- if (!no_blend != cmd->params[0]) stuff_obj = NULL;
	8	+ if ((!no_blend) != cmd->params[0]) stuff_obj = NULL;
	9	no_blend = cmd->params[0];
	10	break;
	11	case attr_Blend:




--- src/AC3DPlugins/obj_editor.cpp.orig	2018-07-05 08:52:21 UTC
+++ src/AC3DPlugins/obj_editor.cpp
@@ -445,9 +445,9 @@ void	OBJ_editor_init(void)
 	for (uintptr_t n = 0; n < NUM_KEYFRAMES; ++n)
 	{
 		char	buf[25];
-		sprintf(buf,"xplane_anim_value%d", n);
+		sprintf(buf,"xplane_anim_value%lu", n);
 		anim_value_vars[n] = new TCL_linked_vardv(ac_get_tcl_interp(), STRING(buf), MAX_MULTI_COUNT, xplane_anim_value_cb, (void *) n, 0);
-		sprintf(buf,"xplane_anim_angle%d", n);
+		sprintf(buf,"xplane_anim_angle%lu", n);
 		anim_angle_vars[n] = new TCL_linked_vardv(ac_get_tcl_interp(), STRING(buf), MAX_MULTI_COUNT, xplane_anim_angle_cb, (void *) n, 0);
 	}
 




--- src/AC3DPlugins/obj_model.cpp.orig	2018-07-05 08:41:42 UTC
+++ src/AC3DPlugins/obj_model.cpp
@@ -354,24 +354,28 @@ float		OBJ_get_anim_nth_angle(ACObject *
 int			OBJ_get_panel_left(ACObject * obj, int r)
 {
 	char tag[25];
-	sprintf(tag,"left0",r);
+	sprintf(tag,"%s","left0");
+	printf("%d",r);
 	return OBJ_get_property_int(obj,tag);
 }
 int			OBJ_get_panel_bottom(ACObject * obj, int r)
 {
 	char tag[25];
-	sprintf(tag,"bottom0",r);
+	sprintf(tag, "%s","bottom0");
+	printf("%d",r);
 	return OBJ_get_property_int(obj,tag);
 }
 int			OBJ_get_panel_right(ACObject * obj, int r)
 {
 	char tag[25];
-	sprintf(tag,"right0",r);
+	sprintf(tag,"%s","right0");
+	printf("%d",r);
 	return OBJ_get_property_int(obj,tag);
 }
 int			OBJ_get_panel_top(ACObject * obj, int r)
 {
 	char tag[25];
-	sprintf(tag,"top0",r);
+	sprintf(tag,"%s","top0");
+	printf("%d",r);
 	return OBJ_get_property_int(obj,tag);
-}
\ No newline at end of file
+}




/usr/local/include/boost/numeric/interval/hw_rounding.hpp:42:4: error: Boost.Numeric.Interval: Please specify rounding control mechanism.
--- src/XESCore/Airports.cpp.orig	2018-07-05 08:14:27 UTC
+++ src/XESCore/Airports.cpp
@@ -38,6 +38,12 @@
 #include "CompGeomUtils.h"
 #include "MapBuffer.h"
 #include <CGAL/convex_hull_2.h>
+// FIXME Arch-specific!
+#ifndef __x86_64__
+#define __x86_64__ YES
+#endif
+#define __USE_ISOC99 YES
+// END FIXME
 #include <CGAL/Sweep_line_2_algorithms.h>




--- src/Utils/unzip.c.orig	2018-07-04 22:41:04 UTC
+++ src/Utils/unzip.c
@@ -509,11 +509,18 @@ local int unzlocal_GetCurrentFileInfoInt
 
 	/* we check the magic */
 	if (err==UNZ_OK)
-		if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK)
+	{
+		if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK) {
 			err=UNZ_ERRNO;
-		else if (uMagic!=0x02014b50)
-			err=UNZ_BADZIPFILE;
-
+		}
+		else
+		{ 
+			if (uMagic!=0x02014b50)
+		{
+				err=UNZ_BADZIPFILE;
+			}
+		}
+	}
 	if (unzlocal_getShort(s->file,&file_info.version) != UNZ_OK)
 		err=UNZ_ERRNO;
 
@@ -584,24 +591,34 @@ local int unzlocal_GetCurrentFileInfoInt
 	{
 		uLong uSizeRead ;
 		if (file_info.size_file_extra<extraFieldBufferSize)
+		{
 			uSizeRead = file_info.size_file_extra;
+		}
 		else
+		{
 			uSizeRead = extraFieldBufferSize;
-
-		if (lSeek!=0)
-			if (fseek(s->file,lSeek,SEEK_CUR)==0)
+		}
+		if (lSeek!=0) 
+		{
+			if (fseek(s->file,lSeek,SEEK_CUR)==0) 
+			{
 				lSeek=0;
+			}
 			else
+			{
 				err=UNZ_ERRNO;
+			}
+		}
 		if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
 			if (fread(extraField,(uInt)uSizeRead,1,s->file)!=1)
 				err=UNZ_ERRNO;
 		lSeek += file_info.size_file_extra - uSizeRead;
 	}
 	else
+	{
 		lSeek+=file_info.size_file_extra;
 
-
+	}
 	if ((err==UNZ_OK) && (szComment!=NULL))
 	{
 		uLong uSizeRead ;
@@ -611,17 +628,30 @@ local int unzlocal_GetCurrentFileInfoInt
 			uSizeRead = file_info.size_file_comment;
 		}
 		else
+		{
 			uSizeRead = commentBufferSize;
+		}
 
-		if (lSeek!=0)
-			if (fseek(s->file,lSeek,SEEK_CUR)==0)
+		if (lSeek!=0) 
+		{
+			if (fseek(s->file,lSeek,SEEK_CUR)==0) 
+			{
 				lSeek=0;
+			}
 			else
+			{
 				err=UNZ_ERRNO;
+			}
+		}
 		if ((file_info.size_file_comment>0) && (commentBufferSize>0))
-			if (fread(szComment,(uInt)uSizeRead,1,s->file)!=1)
+		{
+			if (fread(szComment,(uInt)uSizeRead,1,s->file)!=1) 
+			{
 				err=UNZ_ERRNO;
+			}
+		}
 		lSeek+=file_info.size_file_comment - uSizeRead;
+		
 	}
 	else
 		lSeek+=file_info.size_file_comment;
@@ -791,10 +821,16 @@ local int unzlocal_CheckCurrentFileCoher
 
 
 	if (err==UNZ_OK)
-		if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK)
+	{
+		if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK){
 			err=UNZ_ERRNO;
-		else if (uMagic!=0x04034b50)
+		}
+		else 
+		{
+			if (uMagic!=0x04034b50)
 			err=UNZ_BADZIPFILE;
+		}
+	}
 
 	if (unzlocal_getShort(s->file,&uData) != UNZ_OK)
 		err=UNZ_ERRNO;
@@ -977,7 +1013,7 @@ extern int ZEXPORT unzReadCurrentFile  (
 		return UNZ_PARAMERROR;
 
 
-	if ((pfile_in_zip_read_info->read_buffer == NULL))
+	if (pfile_in_zip_read_info->read_buffer == NULL)
 		return UNZ_END_OF_LIST_OF_FILE;
 	if (len==0)
 		return 0;

Line 0 Link Here

(-)files/patch-zip.c (+14 lines)
	1	--- src/Utils/zip.c.orig 2018-07-05 04:29:44 UTC
	2	+++ src/Utils/zip.c
	3	@@ -378,9 +378,9 @@ extern int ZEXPORT zipOpenNewFileInZip (
	4	zi->ci.flag = 0;
	5	if ((level==8) \|\| (level==9))
	6	zi->ci.flag \|= 2;
	7	- if ((level==2))
	8	+ if (level==2)
	9	zi->ci.flag \|= 4;
	10	- if ((level==1))
	11	+ if (level==1)
	12	zi->ci.flag \|= 6;
	13
	14	zi->ci.crc32 = 0;

Return to bug 229517

Line 0 Link Here

(-)files/patch-AptIO.cpp (+47 lines)
	1	--- src/XESCore/AptIO.cpp.orig 2018-07-04 20:00:56 UTC
	2	+++ src/XESCore/AptIO.cpp
	3	@@ -707,7 +707,7 @@ printf("read open_poly %i elements\n",in
	4	{
	5	//If we've loop through the whole array of ramp_ai_opperation_types
	6	//we have a problem
	7	- if(ramp_operation_type_strings[i] == '\0')
	8	+ if(ramp_operation_type_strings[i] == NULL)
	9	{
	10	ok = string("Error: ") + ramp_op_type_human_string + "is not a real Ramp Operation Type";
	11	break;
	12	@@ -990,7 +990,7 @@ printf("read open_poly %i elements\n",in
	13	}
	14
	15	const char** str = truck_type_strings;
	16	- while(*str != '\0')
	17	+ while(*str != NULL)
	18	{
	19	if (strcmp(truck_type_str.c_str(),*str)==0)
	20	{
	21	@@ -998,7 +998,7 @@ printf("read open_poly %i elements\n",in
	22	break;
	23	}
	24	++str;
	25	- if (*str == '\0')
	26	+ if (*str == NULL)
	27	{
	28	ok = ("Error: Truck type " + truck_type_str + " is not supported.");
	29	}
	30	@@ -1036,7 +1036,7 @@ printf("read open_poly %i elements\n",in
	31	for (vector<string>::iterator itr = tokenized.begin(); itr != tokenized.end(); ++itr)
	32	{
	33	const char** str = truck_type_strings;
	34	- while (*str != '\0')
	35	+ while (*str != NULL)
	36	{
	37	if (strcmp(itr->c_str(), *str) == 0)
	38	{
	39	@@ -1044,7 +1044,7 @@ printf("read open_poly %i elements\n",in
	40	break;
	41	}
	42	++str;
	43	- if (*str == '\0')
	44	+ if (*str == NULL)
	45	{
	46	ok = ("Error: Truck type " + *itr + " is not supported.");
	47	}

Line 0 Link Here

(-)files/patch-DEMDefs.h (+36 lines)
	1	--- src/XESCore/DEMDefs.h.orig 2018-07-04 21:09:41 UTC
	2	+++ src/XESCore/DEMDefs.h
	3	@@ -1217,14 +1217,30 @@ inline bool& DEMMask::operator()(int x,
	4
	5	inline bool DEMMask::operator()(int x, int y) const
	6	{
	7	- if (x < 0 \|\| x >= mWidth \|\| y < 0 \|\| y >= mHeight) return DEM_NO_DATA;
	8	+ bool b;
	9	+ if (x < 0 \|\| x >= mWidth \|\| y < 0 \|\| y >= mHeight)
	10	+ {
	11	+ b=true;
	12	+ return b;
	13	+ }
	14	+ else
	15	+ {
	16	return mData[x + y * mWidth];
	17	+ }
	18	}
	19
	20	-inline bool DEMMask::get(int x, int y) const
	21	+inline bool DEMMask::get(int x, int y) const
	22	{
	23	- if (x < 0 \|\| x >= mWidth \|\| y < 0 \|\| y >= mHeight) return DEM_NO_DATA;
	24	+ bool b;
	25	+ if (x < 0 \|\| x >= mWidth \|\| y < 0 \|\| y >= mHeight)
	26	+ {
	27	+ b=true;
	28	+ return b;
	29	+ }
	30	+ else
	31	+ {
	32	return mData[x + y * mWidth];
	33	+ }
	34	}
	35
	36	inline void DEMMask::set(int x, int y, bool v)

Line 0 Link Here

(-)files/patch-FileUtils.cpp (+18 lines)
	1	--- src/Utils/FileUtils.cpp.orig 2018-07-05 04:33:27 UTC
	2	+++ src/Utils/FileUtils.cpp
	3	@@ -48,7 +48,7 @@
	4	static int desens_partial(DIR * dir, char * io_file)
	5	{
	6	struct dirent* de;
	7	- while (de = readdir(dir))
	8	+ while ((de = readdir(dir)) != NULL)
	9	{
	10	if (!strcasecmp(io_file, de->d_name))
	11	{
	12	@@ -668,4 +668,4 @@ int FILE_compress_dir(const string& src_
	13
	14	return r;
	15
	16	-}
	17	\ No newline at end of file
	18	+}

Line 0 Link Here

(-)files/patch-GUI__Application.cpp (+20 lines)
	1	--- src/GUI/GUI_Application.cpp.orig 2018-07-05 06:04:16 UTC
	2	+++ src/GUI/GUI_Application.cpp
	3	@@ -114,7 +114,7 @@ void GUI_QtMenu::showEvent( QShowEvent *
	4	{
	5	QList<QAction*> actlist = this->actions();
	6	QList<QAction*>::iterator it = actlist.begin();
	7	- for (it ; it != actlist.end(); ++it)
	8	+ for (it = actlist.begin(); it != actlist.end(); ++it)
	9	{
	10	int cmd = (*it)->data().toInt();
	11	if (cmd)
	12	@@ -136,7 +136,7 @@ void GUI_QtMenu::hideEvent( QHideEvent *
	13	// items and their shortcut-action while showevent .
	14	QList<QAction*> actlist = this->actions();
	15	QList<QAction*>::iterator it = actlist.begin();
	16	- for (it ; it != actlist.end(); ++it)
	17	+ for (it = actlist.begin() ; it != actlist.end(); ++it)
	18	{
	19	int cmd = (*it)->data().toInt();
	20	if (cmd) (*it)->setEnabled(true);

Line 0 Link Here

(-)files/patch-GUI__Clipboard.cpp (+42 lines)
	1	--- src/GUI/GUI_Clipboard.cpp.orig 2018-07-04 22:36:05 UTC
	2	+++ src/GUI/GUI_Clipboard.cpp
	3	@@ -131,6 +131,7 @@ bool GUI_Clipboard_HasClipType(GUI_Cli
	4	return (IsClipboardFormatAvailable(sCITs[inType]));
	5	#else
	6	#warning implement clipboard typecheck for linux
	7	+ return true;
	8	#endif
	9	}
	10
	11	@@ -209,6 +210,7 @@ int GUI_Clipboard_GetSize(GUI_ClipTyp
	12
	13	#else
	14	#warning implement clipboard GetSize for linux
	15	+ return true;
	16	#endif
	17	}
	18
	19	@@ -240,6 +242,7 @@ bool GUI_Clipboard_GetData(GUI_ClipTyp
	20
	21	#else
	22	#warning implement clipboard getData() for linux
	23	+ return true;
	24	#endif
	25	}
	26	bool GUI_Clipboard_SetData(int type_count, GUI_ClipType inTypes[], int sizes[], const void * ptrs[])
	27	@@ -279,6 +282,7 @@ bool GUI_Clipboard_SetData(int type_co
	28
	29	#else
	30	#warning implement clipboard setData() for linux
	31	+ return true;
	32	#endif
	33	}
	34
	35	@@ -326,6 +330,7 @@ bool GUI_SetTextToClipboard(const stri
	36	QClipboard* cb = QApplication::clipboard();
	37	QString tex = QString::fromUtf8(inText.c_str());
	38	cb->setText(tex);
	39	+ return true;
	40	#endif
	41	}
	42

Line 0 Link Here

(-)files/patch-GUI__Packer.cpp (+20 lines)
	1	--- src/GUI/GUI_Packer.cpp.orig 2018-07-05 04:58:16 UTC
	2	+++ src/GUI/GUI_Packer.cpp
	3	@@ -85,6 +85,8 @@ void GUI_Packer::PackPane(GUI_Pane * ch
	4	subsize[2] = mPackArea[2];
	5	subsize[3] = mPackArea[3];
	6	break;
	7	+ default:
	8	+ break;
	9	}
	10	child->SetBounds(subsize);
	11	}
	12	@@ -113,6 +115,8 @@ void GUI_Packer::PackPaneToRight(GUI_Pa
	13	subsize[1] = targetsize[3] - subsize[5];
	14	mPackArea[3] = min(targetsize[1], subsize[1]);
	15	break;
	16	+ default:
	17	+ break;
	18	}
	19	child->SetBounds(subsize);
	20	}

Line 0 Link Here

(-)files/patch-GUI__TextTable.cpp (+83 lines)
		1	--- src/GUI/GUI_TextTable.cpp.orig 2018-07-05 05:31:25 UTC
		2	+++ src/GUI/GUI_TextTable.cpp
		3	@@ -295,6 +295,8 @@ void GUI_TextTable::CellDraw (int cell
		4	case gui_Cell_CheckBox:
		5	c.text_val = "";
		6	break;
		7	+ default:
		8	+ break;
		9	}
		10
		11	if(c.can_delete)
		12	@@ -472,6 +474,8 @@ void GUI_TextTable::CellDraw (int cell
		13	glEnd();
		14	glLineWidth(1);
		15	break;
		16	+ default:
		17	+ break;
		18	}
		19	glColor4fv(mColorGridlines);
		20	//-----------------------------------------------------------------
		21	@@ -765,6 +769,8 @@ int GUI_TextTable::CellMouseDown(int c
		22	mEditInfo.content_type = gui_Cell_None;
		23	}
		24	break;
		25	+ default:
		26	+ break;
		27	}
		28	return 1;
		29	}
		30	@@ -822,6 +828,8 @@ void GUI_TextTable::CellMouseDrag(int c
		31	BroadcastMessage(GUI_TABLE_CONTENT_CHANGED, 0);
		32	}
		33	break;
		34	+ default:
		35	+ break;
		36	}
		37	}
		38
		39	@@ -881,6 +889,8 @@ void GUI_TextTable::CellMouseUp (int c
		40	BroadcastMessage(GUI_TABLE_CONTENT_CHANGED, 0);
		41	}
		42	break;
		43	+ default:
		44	+ break;
		45	}
		46	if (!HasEdit())
		47	{
		48	@@ -977,6 +987,8 @@ GUI_DragOperation GUI_TextTable::CellDra
		49	if (mLastOp == gui_Drag_None) if ((mLastOp = mContent->CanDropBetweenRows(cell_y + (mDragPart == drag_IntoOrHigher ? 1 : 0), drag, allowed, recommended)) != gui_Drag_None)
		50	mDragDest = mDragPart == drag_IntoOrHigher ? gui_Insert_Top : gui_Insert_Bottom;
		51	break;
		52	+ default:
		53	+ break;
		54	}
		55	}
		56	else
		57	@@ -1008,6 +1020,8 @@ GUI_DragOperation GUI_TextTable::CellDra
		58	if (mLastOp == gui_Drag_None) if ((mLastOp = mContent->CanDropBetweenColumns(cell_x + (mDragPart == drag_IntoOrHigher ? 1 : 0), drag, allowed, recommended)) != gui_Drag_None)
		59	mDragDest = mDragPart == drag_IntoOrHigher ? gui_Insert_Right : gui_Insert_Left;
		60	break;
		61	+ default:
		62	+ break;
		63	}
		64	}
65	else
66	@@ -1280,6 +1294,8 @@ int GUI_TextTable::TerminateEdit(bool
67	case gui_Cell_Double:
68	mEditInfo.double_val = atof(mEditInfo.text_val.c_str());
69	break;
70	+ default:
71	+ break;
72	}
73	mContent->AcceptEdit(mClickCellX, mClickCellY, mEditInfo, in_all);
74	}
75	@@ -1404,6 +1420,8 @@ int GUI_TextTable::HandleKeyPress(uint
76	}
77	}
78	break;
79	+ default:
80	+ break;
81	}
82
83	if(inKey == GUI_KEY_TAB && HasEdit() && mContent)

Line 0 Link Here

(-)files/patch-WED__AboutBox.cpp (+12 lines)
	1	--- src/WEDWindows/WED_AboutBox.cpp.orig 2018-07-08 15:08:31 UTC
	2	+++ src/WEDWindows/WED_AboutBox.cpp
	3	@@ -79,8 +79,7 @@ void WED_AboutBox::Draw(GUI_GraphState
	4	}
	5
	6	char buf[1024];
	7	-
	8	- sprintf(buf,"WorldEditor " WED_VERSION_STRING ", compiled on "__DATE__" "__TIME__);
	9	+ sprintf( buf, "WorldEditor " WED_VERSION_STRING ", compiled on " "%s %s", __DATE__, __TIME__);
	10
	11	GUI_FontDrawScaled(state, font_UI_Basic, color,
	12	bounds[0],

Line 0 Link Here

(-)files/patch-WED__AptIE.cpp (+135 lines)
		1	--- src/WEDImportExport/WED_AptIE.cpp.orig 2018-07-05 06:19:23 UTC
		2	+++ src/WEDImportExport/WED_AptIE.cpp
		3	@@ -309,7 +309,7 @@ void AptExportRecursive(WED_Thing * what
		4	* a bogus export. */
		5	if(dynamic_cast<WED_OverlayImage *>(what)) return;
		6
		7	- if (apt = dynamic_cast<WED_Airport *>(what))
		8	+ if ((apt = dynamic_cast<WED_Airport *>(what)) != NULL)
		9	{
		10	apts.push_back(AptInfo_t());
		11	apt->Export(apts.back());
		12	@@ -338,11 +338,11 @@ void AptExportRecursive(WED_Thing * what
		13
		14	#endif
		15	}
		16	- else if (bcn = dynamic_cast<WED_AirportBeacon *>(what))
		17	+ else if ((bcn = dynamic_cast<WED_AirportBeacon *>(what)) != NULL)
		18	{
		19	bcn->Export(apts.back().beacon);
		20	}
		21	- else if (bou = dynamic_cast<WED_AirportBoundary *>(what))
		22	+ else if ((bou == dynamic_cast<WED_AirportBoundary *>(what)) != 0)
		23	{
		24	apts.back().boundaries.push_back(AptBoundary_t());
		25	bou->Export(apts.back().boundaries.back());
		26	@@ -357,44 +357,44 @@ void AptExportRecursive(WED_Thing * what
		27	return; // bail out - we already got the children.
		28
		29	}
		30	- else if (cha = dynamic_cast<WED_AirportChain *>(what))
		31	+ else if ((cha = dynamic_cast<WED_AirportChain *>(what)) != NULL)
		32	{
		33	apts.back().lines.push_back(AptMarking_t());
		34	cha->Export(apts.back().lines.back());
		35	ExportLinearPath(cha, apts.back().lines.back().area);
		36	return; // don't waste time with nodes - for speed
		37	}
		38	- else if (sgn = dynamic_cast<WED_AirportSign *>(what))
		39	+ else if ((sgn = dynamic_cast<WED_AirportSign *>(what)) != NULL)
		40	{
		41	apts.back().signs.push_back(AptSign_t());
		42	sgn->Export(apts.back().signs.back());
		43	}
		44	- else if (hel = dynamic_cast<WED_Helipad *>(what))
		45	+ else if ((hel = dynamic_cast<WED_Helipad *>(what)) != NULL)
		46	{
		47	apts.back().helipads.push_back(AptHelipad_t());
		48	hel->Export(apts.back().helipads.back());
		49	}
		50	- else if (lit = dynamic_cast<WED_LightFixture *>(what))
		51	+ else if ((lit = dynamic_cast<WED_LightFixture *>(what)) != NULL)
		52	{
		53	apts.back().lights.push_back(AptLight_t());
		54	lit->Export(apts.back().lights.back());
		55	}
		56	- else if (ram = dynamic_cast<WED_RampPosition *>(what))
		57	+ else if ((ram = dynamic_cast<WED_RampPosition *>(what)) != NULL)
		58	{
		59	apts.back().gates.push_back(AptGate_t());
		60	ram->Export(apts.back().gates.back());
		61	}
		62	- else if (rwy = dynamic_cast<WED_Runway *>(what))
		63	+ else if ((rwy = dynamic_cast<WED_Runway *>(what)) != NULL)
		64	{
65	apts.back().runways.push_back(AptRunway_t());
66	rwy->Export(apts.back().runways.back());
67	}
68	- else if (sea = dynamic_cast<WED_Sealane *>(what))
69	+ else if ((sea = dynamic_cast<WED_Sealane *>(what)) != NULL)
70	{
71	apts.back().sealanes.push_back(AptSealane_t());
72	sea->Export(apts.back().sealanes.back());
73	}
74	- else if (tax = dynamic_cast<WED_Taxiway *>(what))
75	+ else if ((tax = dynamic_cast<WED_Taxiway *>(what)) != NULL)
76	{
77	apts.back().taxiways.push_back(AptTaxiway_t());
78	tax->Export(apts.back().taxiways.back());
79	@@ -409,47 +409,47 @@ void AptExportRecursive(WED_Thing * what
80	}
81	return; // bail out - we already got the children
82	}
83	- else if (twr = dynamic_cast<WED_TowerViewpoint *>(what))
84	+ else if ((twr = dynamic_cast<WED_TowerViewpoint *>(what)) != NULL)
85	{
86	twr->Export(apts.back().tower);
87	}
88	- else if (win = dynamic_cast<WED_Windsock *>(what))
89	+ else if ((win = dynamic_cast<WED_Windsock *>(what)) != NULL)
90	{
91	apts.back().windsocks.push_back(AptWindsock_t());
92	win->Export(apts.back().windsocks.back());
93	}
94	- else if (atc = dynamic_cast<WED_ATCFrequency *>(what))
95	+ else if ((atc = dynamic_cast<WED_ATCFrequency *>(what)) != NULL )
96	{
97	apts.back().atc.push_back(AptATCFreq_t());
98	atc->Export(apts.back().atc.back());
99	}
100	#if AIRPORT_ROUTING
101	- else if(flw = dynamic_cast<WED_ATCFlow *>(what))
102	+ else if((flw = dynamic_cast<WED_ATCFlow *>(what)) != NULL)
103	{
104	apts.back().flows.push_back(AptFlow_t());
105	flw->Export(apts.back().flows.back());
106	}
107	- else if(use = dynamic_cast<WED_ATCRunwayUse *>(what))
108	+ else if((use = dynamic_cast<WED_ATCRunwayUse *>(what)) != NULL)
109	{
110	apts.back().flows.back().runway_rules.push_back(AptRunwayRule_t());
111	use->Export(apts.back().flows.back().runway_rules.back());
112	}
113	- else if(tim = dynamic_cast<WED_ATCTimeRule *>(what))
114	+ else if((tim = dynamic_cast<WED_ATCTimeRule *>(what)) != NULL)
115	{
116	apts.back().flows.back().time_rules.push_back(AptTimeRule_t());
117	tim->Export(apts.back().flows.back().time_rules.back());
118	}
119	- else if(wnd = dynamic_cast<WED_ATCWindRule *>(what))
120	+ else if((wnd = dynamic_cast<WED_ATCWindRule *>(what)) != NULL)
121	{
122	apts.back().flows.back().wind_rules.push_back(AptWindRule_t());
123	wnd->Export(apts.back().flows.back().wind_rules.back());
124	}
125	- else if(trk = dynamic_cast<WED_TruckParkingLocation*>(what))
126	+ else if((trk = dynamic_cast<WED_TruckParkingLocation*>(what)) != NULL)
127	{
128	apts.back().truck_parking.push_back(AptTruckParking_t());
129	trk->Export(apts.back().truck_parking.back());
130	}
131	- else if(dst = dynamic_cast<WED_TruckDestination*>(what))
132	+ else if((dst == dynamic_cast<WED_TruckDestination*>(what)) != 0)
133	{
134	apts.back().truck_destinations.push_back(AptTruckDestination_t());
135	dst->Export(apts.back().truck_destinations.back());

Line 0 Link Here

(-)files/patch-WED__CreateEdgeTool.cpp (+20 lines)
	1	--- src/WEDMap/WED_CreateEdgeTool.cpp.orig 2018-07-05 09:49:45 UTC
	2	+++ src/WEDMap/WED_CreateEdgeTool.cpp
	3	@@ -413,6 +413,8 @@ void WED_CreateEdgeTool::FindNear(WED_Th
	4	for(int n = 0; n < c->GetNumEntities(); ++n)
	5	FindNear(NULL,c->GetNthEntity(n), filter, loc, out_thing, out_dsq);
	6	}
	7	+ default:
	8	+ break;
	9	}
	10	}
	11	else
	12	@@ -485,6 +487,8 @@ void WED_CreateEdgeTool::FindNearP2S(WED
	13	for(int n = 0; n < c->GetNumEntities(); ++n)
	14	FindNearP2S(NULL,c->GetNthEntity(n), filter, loc, out_thing, out_dsq);
	15	}
	16	+ default:
	17	+ break;
	18	}
	19	}
	20	else

Line 0 Link Here

(-)files/patch-WED__CreatePolygonTool.cpp (+22 lines)
	1	--- src/WEDMap/WED_CreatePolygonTool.cpp.orig 2018-07-05 13:24:15 UTC
	2	+++ src/WEDMap/WED_CreatePolygonTool.cpp
	3	@@ -350,12 +350,18 @@ void WED_CreatePolygonTool::AcceptPath(
	4	pol_info_t info;
	5
	6	if(rmgr->GetPol(mResource.value, info))
	7	+ {
	8	if (!info.mUVBox.is_null())
	9	+ {
	10	dpol->SetSubTexture(info.mUVBox);
	11	+ }
	12	else
	13	+ {
	14	dpol->SetSubTexture(Bbox2(0,0,1,1));
	15	-
	16	+ }
	17	dpol->Redrape();
	18	+ }
	19	+
	20	}
	21	else if (mType == create_Hole && host->GetClass() == WED_DrapedOrthophoto::sClass) // holes in orthos also need UV map set
	22	dynamic_cast <WED_DrapedOrthophoto *> (host)->Redrape();

Line 0 Link Here

(-)files/patch-WED__GroupCommands.cpp (+20 lines)
	1	--- src/WEDWindows/WED_GroupCommands.cpp.orig 2018-07-05 04:46:46 UTC
	2	+++ src/WEDWindows/WED_GroupCommands.cpp
	3	@@ -1091,7 +1091,7 @@ set<WED_GISEdge*> do_select_crossing(vec
	4	Bezier2 b1, b2;
	5	bool isb1, isb2;
	6
	7	- if (isb1 = ii->GetSide(gis_Geo, 0, s1, b1))
	8	+ if ((isb1 == ii->GetSide(gis_Geo, 0, s1, b1)) == true)
	9	{
	10	s1.p1 = b1.p1;
	11	s1.p2 = b1.p2;
	12	@@ -1102,7 +1102,7 @@ set<WED_GISEdge*> do_select_crossing(vec
	13	b1.c2 = b1.p2;
	14	}
	15
	16	- if (isb2 = jj->GetSide(gis_Geo, 0, s2, b2))
	17	+ if ((isb2 == jj->GetSide(gis_Geo, 0, s2, b2)) == true)
	18	{
	19	s2.p1 = b2.p1;
	20	s2.p2 = b2.p2;

Line 0 Link Here

(-)files/patch-WED__HandleToolBase.cpp (+47 lines)
	1	--- src/WEDMap/WED_HandleToolBase.cpp.orig 2018-07-05 13:11:22 UTC
	2	+++ src/WEDMap/WED_HandleToolBase.cpp
	3	@@ -513,6 +513,8 @@ int WED_HandleToolBase::ProcessSelectio
	4	if (pt_sel && entity->PtOnFrame(gis_Geo,psel, frame_dist)) { result.insert(entity); return 1; }
	5
	6	break;
	7	+ default:
	8	+ break;
	9	}
	10	return 0;
	11	}
	12	@@ -535,6 +537,8 @@ void WED_HandleToolBase::HandleClickDra
	13	case drag_Handles: mHandles->ControlsHandlesBy(mHandleEntity, mHandleIndex, delta, mTrackPoint); break;
	14	case drag_Links: mHandles->ControlsLinksBy(mHandleEntity, mHandleIndex, delta, mTrackPoint); break;
	15	case drag_Ent: mHandles->ControlsMoveBy(mHandleEntity, delta, mTrackPoint); break;
	16	+ default:
	17	+ break;
	18	}
	19	}
	20	break;
	21	@@ -592,6 +596,8 @@ void WED_HandleToolBase::HandleClickDra
	22	}
	23	}
	24	break;
	25	+ default:
	26	+ break;
	27	}
	28	}
	29
	30	@@ -684,6 +690,8 @@ void WED_HandleToolBase::DrawStructure
	31	case link_Ghost: glColor4fv(WED_Color_RGBA(wed_GhostLink)); break;
	32	case link_BezierCtrl: glColor4fv(WED_Color_RGBA(wed_ControlLink)); break;
	33	case link_Marquee: glColor4fv(WED_Color_RGBA(wed_Marquee)); break;
	34	+ default:
	35	+ break;
	36	}
	37	if (ControlLinkToCurve(mHandles,eid,l,b,s,GetZoomer()))
	38	{
	39	@@ -752,6 +760,8 @@ void WED_HandleToolBase::DrawStructure
	40	case handle_Arrow: GUI_PlotIcon(g,"handle_arrowhead.png", scrpt.x(),scrpt.y(),atan2(orient.dx,orient.dy) * RAD_TO_DEG,1.0); break;
	41	case handle_RotateHead:
	42	case handle_Rotate: GUI_PlotIcon(g,"handle_rotatehead.png", scrpt.x(),scrpt.y(),atan2(orient.dx,orient.dy) * RAD_TO_DEG,1.0); break;
	43	+ default:
	44	+ break;
	45	}
	46	}
	47	}

Line 0 Link Here

(-)files/patch-WED__Package.cpp (+26 lines)
	1	--- src/WEDCore/WED_Package.cpp.orig 2018-07-05 05:01:58 UTC
	2	+++ src/WEDCore/WED_Package.cpp
	3	@@ -103,11 +103,11 @@ WED_Package::WED_Package(const char * in
	4	string wed_folder = mPackageBase + EDIT_DIR_NAME + EARTH_DIR_NAME;
	5	string earth_folder = mPackageBase + EARTH_DIR_NAME;
	6	int err;
	7	- if (err = FILE_make_dir_exist(mPackageBase.c_str()))
	8	+ if ((err = FILE_make_dir_exist(mPackageBase.c_str())) == true)
	9	WED_ThrowPrintf("Unable to create directory %s: %d", mPackageBase.c_str(), err);
	10	- if (err = FILE_make_dir_exist(wed_folder.c_str()))
	11	+ if ((err = FILE_make_dir_exist(wed_folder.c_str())) == true)
	12	WED_ThrowPrintf("Unable to create directory %s: %d", wed_folder.c_str(), err);
	13	- if (err = FILE_make_dir_exist(earth_folder.c_str()))
	14	+ if ((err = FILE_make_dir_exist(earth_folder.c_str())) == true)
	15	WED_ThrowPrintf("Unable to create directory %s: %d", earth_folder.c_str(), err);
	16	}
	17
	18	@@ -174,7 +174,7 @@ WED_Document * WED_Package::OpenTile(int
	19	sprintf(partial, DIR_STR "%+03d%+04d", latlon_bucket(lat),latlon_bucket(lon));
	20	string parent = mPackageBase + EDIT_DIR_NAME + EARTH_DIR_NAME + partial;
	21	int err;
	22	- if (err = FILE_make_dir_exist(parent.c_str()))
	23	+ if ((err = FILE_make_dir_exist(parent.c_str())) == true)
	24	WED_ThrowPrintf("Unable to open create %s: %d", parent.c_str(), err);
	25
	26	WED_Document * tile = new WED_Document(path, bounds);

Line 0 Link Here

(-)files/patch-WED__PreviewLayer.cpp (+15 lines)
	1	--- src/WEDMap/WED_PreviewLayer.cpp.orig 2018-07-05 13:03:46 UTC
	2	+++ src/WEDMap/WED_PreviewLayer.cpp
	3	@@ -362,9 +362,9 @@ struct preview_runway : public WED_Previ
	4
	5	// First, transform our geometry.
	6	rwy->GetCorners(gis_Geo,corners); zoomer->LLToPixelv(corners, corners, 4);
	7	- if (has_blas1 = rwy->GetCornersBlas1(blas1)) zoomer->LLToPixelv(blas1, blas1, 4);
	8	- if (has_blas2 = rwy->GetCornersBlas2(blas2)) zoomer->LLToPixelv(blas2, blas2, 4);
	9	- if (has_shoulders = rwy->GetCornersShoulders(shoulders)) zoomer->LLToPixelv(shoulders, shoulders, 8);
	10	+ if (has_blas1 == rwy->GetCornersBlas1(blas1)) zoomer->LLToPixelv(blas1, blas1, 4);
	11	+ if (has_blas2 == rwy->GetCornersBlas2(blas2)) zoomer->LLToPixelv(blas2, blas2, 4);
	12	+ if (has_shoulders == rwy->GetCornersShoulders(shoulders)) zoomer->LLToPixelv(shoulders, shoulders, 8);
	13
	14	if (mPavementAlpha > 0.0f)
	15	{

Line 0 Link Here

(-)files/patch-WED__StructureLayer.cpp (+37 lines)
	1	--- src/WEDMap/WED_StructureLayer.cpp.orig 2018-07-05 12:13:38 UTC
	2	+++ src/WEDMap/WED_StructureLayer.cpp
	3	@@ -214,11 +214,11 @@ bool WED_StructureLayer::DrawEntityStru
	4
	5	// First, transform our geometry.
	6	rwy->GetCorners(gis_Geo,corners); GetZoomer()->LLToPixelv(corners, corners, 4);
	7	- if (has_blas1 = rwy->GetCornersBlas1(blas1)) GetZoomer()->LLToPixelv(blas1, blas1, 4);
	8	- if (has_blas2 = rwy->GetCornersBlas2(blas2)) GetZoomer()->LLToPixelv(blas2, blas2, 4);
	9	- if (has_disp1 = rwy->GetCornersDisp1(disp1)) GetZoomer()->LLToPixelv(disp1, disp1, 4);
	10	- if (has_disp2 = rwy->GetCornersDisp2(disp2)) GetZoomer()->LLToPixelv(disp2, disp2, 4);
	11	- if (has_shoulders = rwy->GetCornersShoulders(shoulders)) GetZoomer()->LLToPixelv(shoulders, shoulders, 8);
	12	+ if (has_blas1 == rwy->GetCornersBlas1(blas1)) GetZoomer()->LLToPixelv(blas1, blas1, 4);
	13	+ if ((has_blas2 = rwy->GetCornersBlas2(blas2)) == true) GetZoomer()->LLToPixelv(blas2, blas2, 4);
	14	+ if ((has_disp1 = rwy->GetCornersDisp1(disp1)) == true) GetZoomer()->LLToPixelv(disp1, disp1, 4);
	15	+ if ((has_disp2 == rwy->GetCornersDisp2(disp2)) == true) GetZoomer()->LLToPixelv(disp2, disp2, 4);
	16	+ if ((has_shoulders == rwy->GetCornersShoulders(shoulders)) ==true) GetZoomer()->LLToPixelv(shoulders, shoulders, 8);
	17
	18	// "Outline" geometry
	19	glColor4fv(WED_Color_RGBA(struct_color));
	20	@@ -593,6 +593,8 @@ bool WED_StructureLayer::DrawEntityStru
	21	this->DrawEntityStructure(inCurrent,poly->GetNthHole(c),g,selected);
	22	}
	23	break;
	24	+ default:
	25	+ break;
	26	}
	27	return true;
	28	}
	29	@@ -707,6 +709,8 @@ bool WED_StructureLayer::DrawEntityVisu
	30	}
	31	}
	32	break;
	33	+ default:
	34	+ break;
	35	}
	36	return true;
	37	}

Line 0 Link Here

(-)files/patch-WED__TCEVertexTool.cpp (+38 lines)
	1	--- src/WEDTCE/WED_TCEVertexTool.cpp.orig 2018-07-07 14:23:29 UTC
	2	+++ src/WEDTCE/WED_TCEVertexTool.cpp
	3	@@ -156,6 +156,8 @@ void WED_TCEVertexTool::GetNthControlHa
	4	}
	5	}
	6	break;
	7	+ default:
	8	+ break;
	9	}
	10	}
	11
	12	@@ -329,6 +331,8 @@ void WED_TCEVertexTool::ControlsHandles
	13	}
	14	}
	15	break;
	16	+ default:
	17	+ break;
	18	}
	19
	20	// now that we used TCE to modify the UVmaping, update UVbounds
	21	@@ -355,6 +359,8 @@ void WED_TCEVertexTool::ControlsLinksBy
	22	p2->GetLocation(gis_UV,p); p += delta; p2->SetLocation(gis_UV,p);
	23	}
	24	break;
	25	+ default:
	26	+ break;
	27	}
	28	// now that we used TCE to modify the UVmaping, update UVbounds
	29	updateUVbounds(who);
	30	@@ -413,6 +419,8 @@ void WED_TCEVertexTool::SyncRecurse(IGIS
	31	if((c = dynamic_cast<IGISComposite *>(who)) != NULL)
	32	for(int n = 0; n < c->GetNumEntities(); ++n)
	33	SyncRecurse(c->GetNthEntity(n),sel);
	34	+ default:
	35	+ break;
	36	}
	37	}
	38

Line 0 Link Here

(-)files/patch-WED__VertexTool.cpp (+110 lines)
		1	--- src/WEDMap/WED_VertexTool.cpp.orig 2018-07-07 01:19:06 UTC
		2	+++ src/WEDMap/WED_VertexTool.cpp
		3	@@ -182,6 +182,8 @@ int WED_VertexTool::CountControlHandles
		4	e = dynamic_cast<IGISEdge *>(en);
		5	DebugAssert(e);
		6	return e ? 4 : 0;
		7	+ default:
		8	+ break;
		9	}
		10	return 0;
		11	}
		12	@@ -460,6 +462,8 @@ void WED_VertexTool::GetNthControlHandle
		13	return;
		14	}
		15	break;
		16	+ default:
		17	+ break;
		18	}
		19	DebugAssert(!"Cast failed!");
		20	return;
		21	@@ -497,6 +501,8 @@ int WED_VertexTool::GetLinks (intp
		22	case gis_Edge:
		23	e = dynamic_cast<IGISEdge*>(en);
		24	return e ? 3 : 0;
		25	+ default:
		26	+ break;
		27	}
		28	return 0;
		29	}
		30	@@ -533,6 +539,8 @@ void WED_VertexTool::GetNthLinkInfo (in
		31	if(ltype) *ltype = link_BezierCtrl;
		32	if(active) *active = 0;
		33	}
		34	+ default:
		35	+ break;
		36	}
		37	}
		38
		39	@@ -558,6 +566,8 @@ int WED_VertexTool::GetNthLinkSource
		40	case 1: return 0;
		41	case 2: return 3;
		42	}
		43	+ default:
		44	+ break;
		45	}
		46	return 0;
		47	}
		48	@@ -575,6 +585,8 @@ int WED_VertexTool::GetNthLinkSourceCtl
		49	case 1: return 0;
		50	case 2: return 3;
		51	}
		52	+ default:
		53	+ break;
		54	}
		55	return -1;
		56	}
		57	@@ -599,6 +611,8 @@ int WED_VertexTool::GetNthLinkTarget
		58	case 1: return 1;
		59	case 2: return 2;
		60	}
		61	+ default:
		62	+ break;
		63	}
		64	return 0;
65	}
66	@@ -616,6 +630,8 @@ int WED_VertexTool::GetNthLinkTargetCtl
67	case 1: return 1;
68	case 2: return 2;
69	}
70	+ default:
71	+ break;
72	}
73	return -1;
74	}
75	@@ -696,6 +712,8 @@ void WED_VertexTool::ControlsHandlesBy(i
76	case 10: rwy->SetDisp1(rwy->GetDisp1() + axis.dot(delta_m)); break;
77	case 11: rwy->SetDisp2(rwy->GetDisp2() + axis.dot(delta_m)); break;
78	case 12: rwy->SetBlas2(rwy->GetBlas2() + axis.dot(delta_m)); break;
79	+ default:
80	+ break;
81	}
82
83	io_pt += delta;
84	@@ -870,6 +888,8 @@ void WED_VertexTool::ControlsHandlesBy(i
85	}
86	return;
87	}
88	+ default:
89	+ break;
90	}
91	DebugAssert(!"Cast failed!");
92	return;
93	@@ -1058,6 +1078,8 @@ void WED_VertexTool::AddEntityRecursive
94	AddEntityRecursive(cmp->GetNthEntity(n),vis_area);
95	}
96	break;
97	+ default:
98	+ break;
99	}
100	}
101
102	@@ -1147,6 +1169,8 @@ void WED_VertexTool::AddSnapPointRecurs
103	AddSnapPointRecursive(cmp->GetNthEntity(n),vis_area, sel);
104	}
105	break;
106	+ default:
107	+ break;
108	}
109	}
110

Lines 1-6 Link Here

(-)files/patch-libs_Makefile (-5 / +18 lines)
1	--- libs/Makefile.orig 2015-11-30 20:55:15 UTC	1	--- libs/Makefile.orig 2018-07-06 23:45:40 UTC
2	+++ libs/Makefile	2	+++ libs/Makefile
3	@@ -111,6 +111,10 @@	3	@@ -111,6 +111,10 @@ ifeq ($(PLATFORM), Linux)
4	PLAT_LINUX := Yes	4	PLAT_LINUX := Yes
5	VIS := -fvisibility=hidden	5	VIS := -fvisibility=hidden
6	endif	6	endif
Lines 11-17 Link Here
11		11
12	# boost	12	# boost
13	ARCHIVE_BOOST := boost_$(VER_BOOST).tar.gz	13	ARCHIVE_BOOST := boost_$(VER_BOOST).tar.gz
14	@@ -368,9 +372,7 @@	14	@@ -368,9 +372,7 @@ libtiff libproj libgeotiff libsqlite lib
15	libexpat libgmp libmpfr libssl libcurl libjasper	15	libexpat libgmp libmpfr libssl libcurl libjasper
16		16
17	all: ./local$(MULTI_SUFFIX)/.xpt_libs	17	all: ./local$(MULTI_SUFFIX)/.xpt_libs
Lines 22-28 Link Here
22	@touch ./local$(MULTI_SUFFIX)/.xpt_libs	22	@touch ./local$(MULTI_SUFFIX)/.xpt_libs
23		23
24	clean:	24	clean:
25	@@ -629,11 +631,7 @@	25	@@ -629,11 +631,7 @@ libsquish: ./local$(MULTI_SUFFIX)/lib/.x
26		26
27		27
28	libcgal: ./local$(MULTI_SUFFIX)/lib/.xpt_libcgal	28	libcgal: ./local$(MULTI_SUFFIX)/lib/.xpt_libcgal
Lines 35-41 Link Here
35	@echo "building libcgal..."	35	@echo "building libcgal..."
36	@-mkdir -p "./local$(MULTI_SUFFIX)/include"	36	@-mkdir -p "./local$(MULTI_SUFFIX)/include"
37	@-mkdir -p "./local$(MULTI_SUFFIX)/lib"	37	@-mkdir -p "./local$(MULTI_SUFFIX)/lib"
38	@@ -663,24 +661,17 @@	38	@@ -663,24 +661,17 @@ ifdef PLAT_DARWIN
39	endif	39	endif
40	ifdef PLAT_LINUX	40	ifdef PLAT_LINUX
41	@cd "CGAL-$(VER_CGAL)" && \	41	@cd "CGAL-$(VER_CGAL)" && \
Lines 64-66 Link Here
64	endif	64	endif
65	ifdef PLAT_MINGW	65	ifdef PLAT_MINGW
66	@cd "CGAL-$(VER_CGAL)" && \	66	@cd "CGAL-$(VER_CGAL)" && \
		67	@@ -702,6 +693,12 @@ ifdef PLAT_MINGW
		68	-DWITH_CGAL_Qt4=OFF $(BE_QUIET) && \
		69	make $(BE_QUIET) && make install $(BE_QUIET)
		70	endif
		71	+ sed -i "" 's\|static_cast<limb2>(-1) << sizeof_limb\|static_cast<limb2>(-1U << sizeof_limb)\|g' \
		72	+ ./local/include/CGAL/MP_Float.h
		73	+# Placeholder
		74	+# ./local/include/CGAL/Compact_container.h
		75	+ sed -i "" 's\|return \&\*rhs == NULL;\|return rhs.operator->() == NULL;\|'\
		76	+ ./local/include/CGAL/Compact_container.h
		77	@-rm -rf CGAL-$(VER_CGAL)
		78	@touch $@
		79

Line 0 Link Here

(-)files/patch-obj__editor.cpp (+14 lines)
	1	--- src/AC3DPlugins/obj_editor.cpp.orig 2018-07-05 08:52:21 UTC
	2	+++ src/AC3DPlugins/obj_editor.cpp
	3	@@ -445,9 +445,9 @@ void OBJ_editor_init(void)
	4	for (uintptr_t n = 0; n < NUM_KEYFRAMES; ++n)
	5	{
	6	char buf[25];
	7	- sprintf(buf,"xplane_anim_value%d", n);
	8	+ sprintf(buf,"xplane_anim_value%lu", n);
	9	anim_value_vars[n] = new TCL_linked_vardv(ac_get_tcl_interp(), STRING(buf), MAX_MULTI_COUNT, xplane_anim_value_cb, (void *) n, 0);
	10	- sprintf(buf,"xplane_anim_angle%d", n);
	11	+ sprintf(buf,"xplane_anim_angle%lu", n);
	12	anim_angle_vars[n] = new TCL_linked_vardv(ac_get_tcl_interp(), STRING(buf), MAX_MULTI_COUNT, xplane_anim_angle_cb, (void *) n, 0);
	13	}
	14

Line 0 Link Here

(-)files/patch-obj__model.cpp (+37 lines)
	1	--- src/AC3DPlugins/obj_model.cpp.orig 2018-07-05 08:41:42 UTC
	2	+++ src/AC3DPlugins/obj_model.cpp
	3	@@ -354,24 +354,28 @@ float OBJ_get_anim_nth_angle(ACObject *
	4	int OBJ_get_panel_left(ACObject * obj, int r)
	5	{
	6	char tag[25];
	7	- sprintf(tag,"left0",r);
	8	+ sprintf(tag,"%s","left0");
	9	+ printf("%d",r);
	10	return OBJ_get_property_int(obj,tag);
	11	}
	12	int OBJ_get_panel_bottom(ACObject * obj, int r)
	13	{
	14	char tag[25];
	15	- sprintf(tag,"bottom0",r);
	16	+ sprintf(tag, "%s","bottom0");
	17	+ printf("%d",r);
	18	return OBJ_get_property_int(obj,tag);
	19	}
	20	int OBJ_get_panel_right(ACObject * obj, int r)
	21	{
	22	char tag[25];
	23	- sprintf(tag,"right0",r);
	24	+ sprintf(tag,"%s","right0");
	25	+ printf("%d",r);
	26	return OBJ_get_property_int(obj,tag);
	27	}
	28	int OBJ_get_panel_top(ACObject * obj, int r)
	29	{
	30	char tag[25];
	31	- sprintf(tag,"top0",r);
	32	+ sprintf(tag,"%s","top0");
	33	+ printf("%d",r);
	34	return OBJ_get_property_int(obj,tag);
	35	-}
	36	\ No newline at end of file
	37	+}

Lines 1-12 Link Here

(-)files/patch-src_XESCore_Airports.cpp (-2 / +4 lines)
1	/usr/local/include/boost/numeric/interval/hw_rounding.hpp:42:4: error: Boost.Numeric.Interval: Please specify rounding control mechanism.	1	/usr/local/include/boost/numeric/interval/hw_rounding.hpp:42:4: error: Boost.Numeric.Interval: Please specify rounding control mechanism.
2	--- src/XESCore/Airports.cpp.orig 2017-11-07 03:31:14 UTC	2	--- src/XESCore/Airports.cpp.orig 2018-07-05 08:14:27 UTC
3	+++ src/XESCore/Airports.cpp	3	+++ src/XESCore/Airports.cpp
4	@@ -38,6 +38,10 @@	4	@@ -38,6 +38,12 @@
5	#include "CompGeomUtils.h"	5	#include "CompGeomUtils.h"
6	#include "MapBuffer.h"	6	#include "MapBuffer.h"
7	#include <CGAL/convex_hull_2.h>	7	#include <CGAL/convex_hull_2.h>
8	+// FIXME Arch-specific!	8	+// FIXME Arch-specific!
		9	+#ifndef __x86_64__
9	+#define __x86_64__ YES	10	+#define __x86_64__ YES
		11	+#endif
10	+#define __USE_ISOC99 YES	12	+#define __USE_ISOC99 YES
11	+// END FIXME	13	+// END FIXME
12	#include <CGAL/Sweep_line_2_algorithms.h>	14	#include <CGAL/Sweep_line_2_algorithms.h>

Line 0 Link Here

(-)files/patch-unzip.c (+126 lines)
		1	--- src/Utils/unzip.c.orig 2018-07-04 22:41:04 UTC
		2	+++ src/Utils/unzip.c
		3	@@ -509,11 +509,18 @@ local int unzlocal_GetCurrentFileInfoInt
		4
		5	/* we check the magic */
		6	if (err==UNZ_OK)
		7	- if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK)
		8	+ {
		9	+ if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK) {
		10	err=UNZ_ERRNO;
		11	- else if (uMagic!=0x02014b50)
		12	- err=UNZ_BADZIPFILE;
		13	-
		14	+ }
		15	+ else
		16	+ {
		17	+ if (uMagic!=0x02014b50)
		18	+ {
		19	+ err=UNZ_BADZIPFILE;
		20	+ }
		21	+ }
		22	+ }
		23	if (unzlocal_getShort(s->file,&file_info.version) != UNZ_OK)
		24	err=UNZ_ERRNO;
		25
		26	@@ -584,24 +591,34 @@ local int unzlocal_GetCurrentFileInfoInt
		27	{
		28	uLong uSizeRead ;
		29	if (file_info.size_file_extra<extraFieldBufferSize)
		30	+ {
		31	uSizeRead = file_info.size_file_extra;
		32	+ }
		33	else
		34	+ {
		35	uSizeRead = extraFieldBufferSize;
		36	-
		37	- if (lSeek!=0)
		38	- if (fseek(s->file,lSeek,SEEK_CUR)==0)
		39	+ }
		40	+ if (lSeek!=0)
		41	+ {
		42	+ if (fseek(s->file,lSeek,SEEK_CUR)==0)
		43	+ {
		44	lSeek=0;
		45	+ }
		46	else
		47	+ {
		48	err=UNZ_ERRNO;
		49	+ }
		50	+ }
		51	if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
		52	if (fread(extraField,(uInt)uSizeRead,1,s->file)!=1)
		53	err=UNZ_ERRNO;
		54	lSeek += file_info.size_file_extra - uSizeRead;
		55	}
		56	else
		57	+ {
		58	lSeek+=file_info.size_file_extra;
		59
		60	-
		61	+ }
		62	if ((err==UNZ_OK) && (szComment!=NULL))
		63	{
		64	uLong uSizeRead ;
65	@@ -611,17 +628,30 @@ local int unzlocal_GetCurrentFileInfoInt
66	uSizeRead = file_info.size_file_comment;
67	}
68	else
69	+ {
70	uSizeRead = commentBufferSize;
71	+ }
72
73	- if (lSeek!=0)
74	- if (fseek(s->file,lSeek,SEEK_CUR)==0)
75	+ if (lSeek!=0)
76	+ {
77	+ if (fseek(s->file,lSeek,SEEK_CUR)==0)
78	+ {
79	lSeek=0;
80	+ }
81	else
82	+ {
83	err=UNZ_ERRNO;
84	+ }
85	+ }
86	if ((file_info.size_file_comment>0) && (commentBufferSize>0))
87	- if (fread(szComment,(uInt)uSizeRead,1,s->file)!=1)
88	+ {
89	+ if (fread(szComment,(uInt)uSizeRead,1,s->file)!=1)
90	+ {
91	err=UNZ_ERRNO;
92	+ }
93	+ }
94	lSeek+=file_info.size_file_comment - uSizeRead;
95	+
96	}
97	else
98	lSeek+=file_info.size_file_comment;
99	@@ -791,10 +821,16 @@ local int unzlocal_CheckCurrentFileCoher
100
101
102	if (err==UNZ_OK)
103	- if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK)
104	+ {
105	+ if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK){
106	err=UNZ_ERRNO;
107	- else if (uMagic!=0x04034b50)
108	+ }
109	+ else
110	+ {
111	+ if (uMagic!=0x04034b50)
112	err=UNZ_BADZIPFILE;
113	+ }
114	+ }
115
116	if (unzlocal_getShort(s->file,&uData) != UNZ_OK)
117	err=UNZ_ERRNO;
118	@@ -977,7 +1013,7 @@ extern int ZEXPORT unzReadCurrentFile (
119	return UNZ_PARAMERROR;
120
121
122	- if ((pfile_in_zip_read_info->read_buffer == NULL))
123	+ if (pfile_in_zip_read_info->read_buffer == NULL)
124	return UNZ_END_OF_LIST_OF_FILE;
125	if (len==0)
126	return 0;