From fdb3ec98d416815ae684bcde2cfee5eaf998a39c Mon Sep 17 00:00:00 2001 From: Debian Science Maintainers Date: Fri, 6 May 2011 14:52:41 +0100 Subject: [PATCH] OpenCASCADE6.3.0-strcmp char* comparison must be performed by strcmp, not == Patch found in openSUSE rpm package Submitted upstream: http://www.opencascade.org/org/forum/thread_20049/ Gbp-Pq: Topic submitted Gbp-Pq: Name OpenCASCADE6.3.0-strcmp.patch --- .../TestTopOpeDraw_OtherCommands.cxx | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ros/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx b/ros/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx index 48cd48d2b..d066d621b 100644 --- a/ros/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx +++ b/ros/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx @@ -98,21 +98,21 @@ Standard_EXPORT void OthersCommands_flags(Standard_Integer& na,const char** a,Te } else if(a[iloc][j] == 'c') { col=Standard_True; - if(a[iloc+1] == "blanc") Color = Draw_blanc; - else if (a[iloc+1] == "rouge") Color = Draw_rouge; - else if (a[iloc+1] == "vert") Color = Draw_vert; - else if (a[iloc+1] == "bleu") Color = Draw_bleu; - else if (a[iloc+1] == "cyan") Color = Draw_cyan; - else if (a[iloc+1] == "or") Color = Draw_or; - else if (a[iloc+1] == "magenta") Color = Draw_magenta; - else if (a[iloc+1] == "marron") Color = Draw_marron; - else if (a[iloc+1] == "orange") Color = Draw_orange; - else if (a[iloc+1] == "rose") Color = Draw_rose; - else if (a[iloc+1] == "saumon") Color = Draw_saumon; - else if (a[iloc+1] == "violet") Color = Draw_violet; - else if (a[iloc+1] == "jaune") Color = Draw_jaune; - else if (a[iloc+1] == "kaki") Color = Draw_kaki; - else if (a[iloc+1] == "corail") Color = Draw_corail; + if(strcmp(a[iloc+1], "blanc") == 0) Color = Draw_blanc; + else if(strcmp(a[iloc+1], "rouge") == 0) Color = Draw_rouge; + else if(strcmp(a[iloc+1], "vert") == 0) Color = Draw_vert; + else if(strcmp(a[iloc+1], "bleu") == 0) Color = Draw_bleu; + else if(strcmp(a[iloc+1], "cyan") == 0) Color = Draw_cyan; + else if(strcmp(a[iloc+1], "or") == 0) Color = Draw_or; + else if(strcmp(a[iloc+1], "magenta") == 0) Color = Draw_magenta; + else if(strcmp(a[iloc+1], "marron") == 0) Color = Draw_marron; + else if(strcmp(a[iloc+1], "orange") == 0) Color = Draw_orange; + else if(strcmp(a[iloc+1], "rose") == 0) Color = Draw_rose; + else if(strcmp(a[iloc+1], "saumon") == 0) Color = Draw_saumon; + else if(strcmp(a[iloc+1], "violet") == 0) Color = Draw_violet; + else if(strcmp(a[iloc+1], "jaune") == 0) Color = Draw_jaune; + else if(strcmp(a[iloc+1], "kaki") == 0) Color = Draw_kaki; + else if(strcmp(a[iloc+1], "corail") == 0) Color = Draw_corail; decal++;dloc++; } } -- 2.30.2