clean up compiler warnings

1 files changed, 14 insertions, 18 deletions

diff --git a/rotord/src/graph.cpp b/rotord/src/graph.cpp
index 23e2c93..e34ddec 100644
--- a/rotord/src/graph.cpp
+++ b/rotord/src/graph.cpp
@@ -70,12 +70,12 @@ bool Graph::preview(xmlIO &XML,string &node,string &_format,int frame,int w,int
 		if (dynamic_cast<Image_node*>(nodes[node])){
 			Frame_spec fs=Frame_spec(t,framerate,0.0f,w,h);
 			Image *img=dynamic_cast<Image_node*>(nodes[node])->get_image_output(fs);
-			vector<uchar> buf;
+			vector<unsigned char> buf;
 			string format=(_format==""?".png":_format);
 			if (cv::imencode(format,img->rgb,buf)){ //, const vector<int>& params=vector<int>())
 				stringstream output;
 				Poco::Base64Encoder *enc=new Poco::Base64Encoder(output);
-				enc->write(buf.data(),buf.size());
+				enc->write((char*)buf.data(),buf.size());
 				enc->close();
 				delete enc;
 				XML.addValue("image",output.str());
@@ -113,7 +113,6 @@ bool Graph::video_render(const string &output_filename,const float framerate,int
 		//
 		//setup defaults
 
-		AVCodecID codecId=AV_CODEC_ID_H264; //MPEG4;
 		std::string container;
 		Poco::StringTokenizer t(output_filename,".");
         if (t.count()>1){
@@ -124,7 +123,6 @@ bool Graph::video_render(const string &output_filename,const float framerate,int
 	    //at the moment it crashes if you render before audio is loaded and also on 2nd render
 	    libav::exporter exporter;
 
-	    float spct=100.0f/duration;
 	    Image* i;
 
 		if (exporter.setup(outW,outH,bitRate,framerate,container,use_fragmentation)) { //codecId,
@@ -133,8 +131,7 @@ bool Graph::video_render(const string &output_filename,const float framerate,int
 				libav::audio_decoder audioloader;
 
 				bool usingaudio=audioloader.open(audio_filename);
-				float *avframe=nullptr;
-
+				
 				Logger& logger = Logger::get("Rotor");
 				logger.information("Video_output rendering "+output_filename+": "+toString(duration)+" seconds at "+toString(framerate)+" fps, audio frame size: "+toString(exporter.get_audio_framesize()));
 				//25fps video and 43.06640625fps audio? hmm
@@ -157,7 +154,6 @@ bool Graph::video_render(const string &output_filename,const float framerate,int
 				}
 
 				float vstep=1.0f/framerate;
-				float v=0.0f;
 				float vf=start*vstep;
 				float af=start*vstep;
 				int aoffs=0;
@@ -317,7 +313,7 @@ bool Graph::parseJson(string &data,string &media_path){
 	check_audio(root["audio"].asString(),media_path);
 	init(root["ID"].asString(),root["description"].asString());
 	Json::Value jnodes = root["nodeDefinitions"];
-	for ( int i = 0; i < jnodes.size(); ++i ) {
+	for ( uint32_t i = 0; i < jnodes.size(); ++i ) {
 	   string nodeID=jnodes[i]["id"].asString();
 	   //cerr<<"json found node: "<<jnodes[i]["type"].asString()<<endl;
 	   map<string,string> settings;
@@ -326,7 +322,7 @@ bool Graph::parseJson(string &data,string &media_path){
 		//attributes
 		settings["media_path"]=media_path;
 	  	Node* node=factory.create(settings);
-	  	for (int m=0;m<jnodes[i]["attributes"].size();m++){
+	  	for (uint32_t m=0;m<jnodes[i]["attributes"].size();m++){
 			string attribute=jnodes[i]["attributes"][m]["name"].asString();
 			if (node->attributes.find(attribute)!=node->attributes.end()){
 				Attribute *attr=node->attributes.find(attribute)->second;
@@ -337,7 +333,7 @@ bool Graph::parseJson(string &data,string &media_path){
 				else if (attr->type=="array"){
 					std::vector<std::string> vals;
 
-					for (int i5 = 0; i5 < jnodes[i]["attributes"][m]["value"].size(); i5++ )
+					for (uint32_t i5 = 0; i5 < jnodes[i]["attributes"][m]["value"].size(); i5++ )
 					{
 						vals.push_back(jnodes[i]["attributes"][m]["value"][i5].asString());
 					}
@@ -357,7 +353,7 @@ bool Graph::parseJson(string &data,string &media_path){
 				cerr << "Rotor: creating node '"<<nodeID<<"': '"<< settings["type"] << "'" << endl;
 				nodes[nodeID]=node;
 				//signal inputs
-			   	for (int j=0;j< jnodes[i]["signal_inputs"].size();j++){
+			   	for (uint32_t j=0;j< jnodes[i]["signal_inputs"].size();j++){
 			   		if ((nodes[nodeID])->inputs.size()>j) {
 						string fromID=jnodes[i]["signal_inputs"][j]["from"].asString();
 						if (fromID!=""){
@@ -390,7 +386,7 @@ bool Graph::parseJson(string &data,string &media_path){
 					}
 
 
-					for (int k=0;k<jnodes[i]["image_inputs"].size();k++){
+					for (uint32_t k=0;k<jnodes[i]["image_inputs"].size();k++){
 						if (((Image_node*)nodes[nodeID])->image_inputs.size()<=k) {
 							if (nodes[nodeID]->duplicate_inputs) {
 								while(((Image_node*)nodes[nodeID])->image_inputs.size()<=k){
@@ -418,7 +414,7 @@ bool Graph::parseJson(string &data,string &media_path){
 					}
 				}
 				//parameters
-				for (int l=0;l<jnodes[i]["parameters"].size();l++){
+				for (uint32_t l=0;l<jnodes[i]["parameters"].size();l++){
 
 					string parameter=jnodes[i]["parameters"][l]["name"].asString();
 
@@ -478,8 +474,8 @@ bool Graph::parseXml(string media_path){
 						cerr << "Rotor: creating node '"<<nodeID<<"': '"<< xml.getAttribute("node","type","",i1) << "'" << endl;
 						nodes[nodeID]=node;
 						if(xml.pushTag("node",i1)) {
-							int n2=xml.getNumTags("signal_input");
-							for (int i2=0;i2<n2;i2++){
+							uint32_t n2=xml.getNumTags("signal_input");
+							for (uint32_t i2=0;i2<n2;i2++){
 								//TODO expand
 								//nodes[nodeID]->create_signal_input(xml.getAttribute("signal_input","description","",i2),xml.getAttribute("signal_input","title","",i2));
 								if ((nodes[nodeID])->inputs.size()>i2) {
@@ -496,10 +492,10 @@ bool Graph::parseXml(string media_path){
 								else cerr << "Rotor: input " << i2 << " of node: '" << nodeID << "' does not exist" << endl;
 
 							}
-							int n3=xml.getNumTags("image_input");
-							for (int i3=0;i3<n3;i3++){
+							uint32_t n3=xml.getNumTags("image_input");
+							for (uint32_t i3=0;i3<n3;i3++){
 								//handle expandable inputs
-								if (((Image_node*)nodes[nodeID])->image_inputs.size()<=i3&((Image_node*)nodes[nodeID])->duplicate_inputs){
+								if ((((Image_node*)nodes[nodeID])->image_inputs.size()<=i3)&&((Image_node*)nodes[nodeID])->duplicate_inputs){
 									string desc=((Image_node*)nodes[nodeID])->image_inputs[0]->description;
 									string title=((Image_node*)nodes[nodeID])->image_inputs[0]->title;
 									while(((Image_node*)nodes[nodeID])->image_inputs.size()<=i3){