Skip to content

Commit ee5efa3

Browse files
committed
bunch of compile warning fixes
1 parent 712799e commit ee5efa3

18 files changed

+36
-30
lines changed

src/PatchObject.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ class PatchObject : public ofxVPHasUID {
165165
string getOutletTypeName(const int& oid) const;
166166
ImVec2 getInletPosition(int iid);
167167
ImVec2 getOutletPosition(int oid);
168-
int getNumInlets() { return inletsType.size(); }
169-
int getNumOutlets() { return outletsType.size(); }
168+
int getNumInlets() { return static_cast<int>(inletsType.size()); }
169+
int getNumOutlets() { return static_cast<int>(outletsType.size()); }
170170
bool getIsOutletConnected(int oid);
171171
bool getWillErase() { return willErase; }
172172

src/core/imgui_helpers.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,12 @@ inline void drawTimecode(ImDrawList* drawList, int seconds, std::string pre="",
117117

118118
if(onDrawList){
119119
char temp[256];
120+
#if defined(TARGET_WIN32)
121+
sprintf_s(temp,"%s %s:%s:%s", pre.c_str(), _sh.c_str(), _sm.c_str(), _ss.c_str());
122+
#else
120123
sprintf(temp,"%s %s:%s:%s", pre.c_str(), _sh.c_str(), _sm.c_str(), _ss.c_str());
124+
#endif
125+
121126
drawList->AddText(ImGui::GetFont(), ImGui::GetFontSize()*fontScale, pos, IM_COL32_WHITE,temp, NULL, 0.0f);
122127
}else{
123128
ImGui::Text("%s %s:%s:%s", pre.c_str(), _sh.c_str(), _sm.c_str(), _ss.c_str());

src/core/imgui_plot.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ PlotStatus Plot(const char* label, const PlotConfig& conf) {
261261
uint32_t end = start;
262262
if (conf.selection.sanitize_fn)
263263
end = conf.selection.sanitize_fn(end - start) + start;
264-
if (end < conf.values.offset + conf.values.count) {
264+
if (static_cast<int>(end) < conf.values.offset + conf.values.count) {
265265
*conf.selection.start = start;
266266
*conf.selection.length = end - start;
267267
status = PlotStatus::selection_updated;
@@ -277,7 +277,7 @@ PlotStatus Plot(const char* label, const PlotConfig& conf) {
277277
if (end > start) {
278278
if (conf.selection.sanitize_fn)
279279
end = conf.selection.sanitize_fn(end - start) + start;
280-
if (end < conf.values.offset + conf.values.count) {
280+
if (static_cast<int>(end) < conf.values.offset + conf.values.count) {
281281
*conf.selection.length = end - start;
282282
status = PlotStatus::selection_updated;
283283
}
@@ -318,7 +318,7 @@ PlotStatus PlotVar(const char* label, const PlotVarConfig& conf, ImU32 color) {
318318
PlotVarData& pvd = g_PlotVarsMap[id];
319319

320320
// Setup
321-
if (pvd.Data.capacity() != conf.buffer_size)
321+
if (pvd.Data.capacity() != static_cast<int>(conf.buffer_size))
322322
{
323323
pvd.Data.resize(conf.buffer_size);
324324
memset(&pvd.Data[0], 0, sizeof(float) * conf.buffer_size);
@@ -327,23 +327,18 @@ PlotStatus PlotVar(const char* label, const PlotVarConfig& conf, ImU32 color) {
327327
}
328328

329329
// Insert (avoid unnecessary modulo operator)
330-
if (pvd.DataInsertIdx == conf.buffer_size)
330+
if (pvd.DataInsertIdx == static_cast<int>(conf.buffer_size))
331331
pvd.DataInsertIdx = 0;
332332
//int display_idx = pvd.DataInsertIdx;
333333
if (conf.value != FLT_MAX)
334334
pvd.Data[pvd.DataInsertIdx++] = conf.value;
335335

336336
// Draw
337337
int current_frame = ImGui::GetFrameCount();
338-
if (pvd.LastFrame != current_frame)
339-
{
340-
//char overlay[32];
341-
//sprintf(overlay, "%-3.4f", pvd.Data[display_idx]);
338+
if (pvd.LastFrame != current_frame){
342339
ImGui::PushStyleColor(ImGuiCol_PlotLines, color);
343340
ImGui::PlotLines("##plot", &pvd.Data[0], conf.buffer_size, pvd.DataInsertIdx, NULL, conf.scale.min, conf.scale.max, ImVec2(conf.frame_size.x, conf.frame_size.y));
344341
ImGui::PopStyleColor(1);
345-
//ImGui::SameLine();
346-
//ImGui::Text("%s\n%-3.4f", label, pvd.Data[display_idx]); // Display last value in buffer
347342
pvd.LastFrame = current_frame;
348343

349344
status = PlotStatus::selection_updated;

src/objects/audio_analysis/BPMExtractor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void BPMExtractor::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){
160160
ImVec2 pos = ImVec2(window_pos.x + window_size.x - (50*scaleFactor), window_pos.y + window_size.y/2);
161161

162162
char temp[32];
163-
sprintf(temp,"%i",static_cast<int>(floor(*(float *)&_outletParams[1])));
163+
sprintf_s(temp,"%i",static_cast<int>(floor(*(float *)&_outletParams[1])));
164164
_nodeCanvas.getNodeDrawList()->AddText(ImGui::GetFont(), ImGui::GetFontSize(), pos, IM_COL32_WHITE,temp, NULL, 0.0f);
165165

166166
if(*(float *)&_outletParams[0] > 0){

src/objects/data/BangMultiplexer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ void BangMultiplexer::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){
162162
for(int i=0;i<this->numInlets;i++){
163163
_nodeCanvas.getNodeDrawList()->AddLine(ImVec2(window_pos.x + (50*this->scaleFactor),window_pos.y + (IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor) + (pinDistance/2) + pinDistance*i),ImVec2(window_pos.x + (90*this->scaleFactor),window_pos.y + (IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor) + (pinDistance/2) + pinDistance*i),IM_COL32(60,60,60,255),2.0f);
164164
_nodeCanvas.getNodeDrawList()->AddLine(ImVec2(window_pos.x + (90*this->scaleFactor),window_pos.y + (IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor) + (pinDistance/2) + pinDistance*i),ImVec2(window_pos.x+window_size.x,window_pos.y+(IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor)+((window_size.y-((IMGUI_EX_NODE_HEADER_HEIGHT+IMGUI_EX_NODE_FOOTER_HEIGHT)*this->scaleFactor))/2)),IM_COL32(60,60,60,255),2.0f);
165-
sprintf(temp,"%.2f",*(float *)&_inletParams[i]);
165+
sprintf_s(temp,"%.2f",*(float *)&_inletParams[i]);
166166
_nodeCanvas.getNodeDrawList()->AddText(ImGui::GetFont(), ImGui::GetFontSize(), ImVec2(window_pos.x+(20*this->scaleFactor),window_pos.y + ((IMGUI_EX_NODE_HEADER_HEIGHT-7)*this->scaleFactor) + (pinDistance/2) + pinDistance*i), IM_COL32_WHITE, temp, NULL, 0.0f);
167167
}
168168

src/objects/data/DataToFile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ void DataToFile::drawObjectNodeConfig(){
188188
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, VHS_RED_OVER);
189189
ImGui::PushStyleColor(ImGuiCol_ButtonActive, VHS_RED_OVER);
190190
char tmp[256];
191-
sprintf(tmp,"%s %s",ICON_FA_CIRCLE, recButtonLabel.c_str());
191+
sprintf_s(tmp,"%s %s",ICON_FA_CIRCLE, recButtonLabel.c_str());
192192
if(ImGui::Button(tmp,ImVec2(108*scaleFactor,26*scaleFactor))){
193193
if(!this->inletsConnected[0]){
194194
ofLog(OF_LOG_WARNING,"There is no data cable connected to the object inlet, connect something if you want to export it!");

src/objects/data/FloatMultiplexer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void FloatMultiplexer::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){
160160
for(int i=0;i<this->numInlets;i++){
161161
_nodeCanvas.getNodeDrawList()->AddLine(ImVec2(window_pos.x + (50*this->scaleFactor),window_pos.y + (IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor) + (pinDistance/2) + pinDistance*i),ImVec2(window_pos.x + (90*this->scaleFactor),window_pos.y + (IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor) + (pinDistance/2) + pinDistance*i),IM_COL32(60,60,60,255),2.0f);
162162
_nodeCanvas.getNodeDrawList()->AddLine(ImVec2(window_pos.x + (90*this->scaleFactor),window_pos.y + (IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor) + (pinDistance/2) + pinDistance*i),ImVec2(window_pos.x+window_size.x,window_pos.y+(IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor)+((window_size.y-((IMGUI_EX_NODE_HEADER_HEIGHT+IMGUI_EX_NODE_FOOTER_HEIGHT)*this->scaleFactor))/2)),IM_COL32(60,60,60,255),2.0f);
163-
sprintf(temp,"%.2f",*(float *)&_inletParams[i]);
163+
sprintf_s(temp,"%.2f",*(float *)&_inletParams[i]);
164164
_nodeCanvas.getNodeDrawList()->AddText(ImGui::GetFont(), ImGui::GetFontSize(), ImVec2(window_pos.x+(20*this->scaleFactor),window_pos.y + ((IMGUI_EX_NODE_HEADER_HEIGHT-7)*this->scaleFactor) + (pinDistance/2) + pinDistance*i), IM_COL32_WHITE, temp, NULL, 0.0f);
165165
}
166166

src/objects/data/FloatsToVector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void FloatsToVector::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){
158158
for(int i=0;i<this->numInlets;i++){
159159
_nodeCanvas.getNodeDrawList()->AddLine(ImVec2(window_pos.x + (50*this->scaleFactor),window_pos.y + (IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor) + (pinDistance/2) + pinDistance*i),ImVec2(window_pos.x + (90*this->scaleFactor),window_pos.y + (IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor) + (pinDistance/2) + pinDistance*i),IM_COL32(60,60,60,255),2.0f);
160160
_nodeCanvas.getNodeDrawList()->AddLine(ImVec2(window_pos.x + (90*this->scaleFactor),window_pos.y + (IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor) + (pinDistance/2) + pinDistance*i),ImVec2(window_pos.x+window_size.x,window_pos.y+(IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor)+((window_size.y-((IMGUI_EX_NODE_HEADER_HEIGHT+IMGUI_EX_NODE_FOOTER_HEIGHT)*this->scaleFactor))/2)),IM_COL32(60,60,60,255),2.0f);
161-
sprintf(temp,"%.2f",*(float *)&_inletParams[i]);
161+
sprintf_s(temp,"%.2f",*(float *)&_inletParams[i]);
162162
_nodeCanvas.getNodeDrawList()->AddText(ImGui::GetFont(), ImGui::GetFontSize(), ImVec2(window_pos.x+(20*this->scaleFactor),window_pos.y + ((IMGUI_EX_NODE_HEADER_HEIGHT-7)*this->scaleFactor) + (pinDistance/2) + pinDistance*i), IM_COL32_WHITE, temp, NULL, 0.0f);
163163
}
164164

src/objects/logic/Gate.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void Gate::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){
166166
for(int i=1;i<this->numInlets;i++){
167167
if(i == openInlet){
168168
_nodeCanvas.getNodeDrawList()->AddLine(ImVec2(window_pos.x + (50*this->scaleFactor),window_pos.y + (IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor) + (pinDistance/2) + pinDistance*i),ImVec2(window_pos.x + (90*this->scaleFactor),window_pos.y + (IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor) + (pinDistance/2) + pinDistance*i),IM_COL32(60,60,60,255),2.0f);
169-
sprintf(temp,"%.2f",*(float *)&_inletParams[i]);
169+
sprintf_s(temp,"%.2f",*(float *)&_inletParams[i]);
170170
_nodeCanvas.getNodeDrawList()->AddText(ImGui::GetFont(), ImGui::GetFontSize(), ImVec2(window_pos.x+(20*this->scaleFactor),window_pos.y + ((IMGUI_EX_NODE_HEADER_HEIGHT-7)*this->scaleFactor) + (pinDistance/2) + pinDistance*i), IM_COL32_WHITE, temp, NULL, 0.0f);
171171
}
172172
_nodeCanvas.getNodeDrawList()->AddLine(ImVec2(window_pos.x + (90*this->scaleFactor),window_pos.y + (IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor) + (pinDistance/2) + pinDistance*i),ImVec2(window_pos.x+window_size.x,window_pos.y+(IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor)+((window_size.y-((IMGUI_EX_NODE_HEADER_HEIGHT+IMGUI_EX_NODE_FOOTER_HEIGHT)*this->scaleFactor))/2)),IM_COL32(60,60,60,255),2.0f);

src/objects/sound/AudioExporter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ void AudioExporter::drawObjectNodeConfig(){
216216
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, VHS_RED_OVER);
217217
ImGui::PushStyleColor(ImGuiCol_ButtonActive, VHS_RED_OVER);
218218
char tmp[256];
219-
sprintf(tmp,"%s %s",ICON_FA_CIRCLE, recButtonLabel.c_str());
219+
sprintf_s(tmp,"%s %s",ICON_FA_CIRCLE, recButtonLabel.c_str());
220220
if(ImGui::Button(tmp,ImVec2(108*scaleFactor,26*scaleFactor))){
221221
if(!this->inletsConnected[0]){
222222
ofLog(OF_LOG_WARNING,"There is no ofSoundBuffer connected to the object inlet, connect something if you want to export it as audio!");

0 commit comments

Comments
 (0)