diff --git a/devsetup.cpp b/devsetup.cpp index 743231275..b21de7e07 100644 --- a/devsetup.cpp +++ b/devsetup.cpp @@ -109,8 +109,8 @@ void DevSetup::initDlg() ui.mult570SpinBox->setValue(m_mult570); ui.mult570TxSpinBox->setValue(m_mult570Tx); ui.cal570SpinBox->setValue(m_cal570); - sscanf(m_colors.toLatin1(),"%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x", - &r,&g,&b,&r0,&g0,&b0,&r1,&g1,&b1,&r2,&g2,&b2,&r3,&g3,&b3); +// sscanf(m_colors.toLatin1(),"%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x", +// &r,&g,&b,&r0,&g0,&b0,&r1,&g1,&b1,&r2,&g2,&b2,&r3,&g3,&b3); updateColorLabels(); ui.sbBackgroundRed->setValue(r); ui.sbBackgroundGreen->setValue(g); diff --git a/libm65/CMakeLists.txt b/libm65/CMakeLists.txt index 685f96854..b0e89729c 100644 --- a/libm65/CMakeLists.txt +++ b/libm65/CMakeLists.txt @@ -136,13 +136,13 @@ set (FSRCS ) set (CSRCS - cutil.c decode_rs.c encode_rs.c gran.c igray.c init_rs.c tmoonsub.c + usleep.c wrapkarn.c ) diff --git a/plotter.cpp b/plotter.cpp index a115132c7..1792a8b60 100644 --- a/plotter.cpp +++ b/plotter.cpp @@ -694,7 +694,7 @@ void CPlotter::setPalette(QString palette) //setPalette() int n,r,g,b; float xr,xg,xb; for(int i=0; i<256; i++) { - fscanf(fp,"%d%f%f%f",&n,&xr,&xg,&xb); +// fscanf(fp,"%d%f%f%f",&n,&xr,&xg,&xb); r=255.0*xr + 0.5; g=255.0*xg + 0.5; b=255.0*xb + 0.5; @@ -707,7 +707,7 @@ void CPlotter::setPalette(QString palette) //setPalette() int n,r,g,b; float xr,xg,xb; for(int i=0; i<256; i++) { - fscanf(fp,"%d%f%f%f",&n,&xr,&xg,&xb); +// fscanf(fp,"%d%f%f%f",&n,&xr,&xg,&xb); r=255.0*xr + 0.5; g=255.0*xg + 0.5; b=255.0*xb + 0.5;