mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Make sequence-point warning go away. "Fixes" 311857 

Sample code that mimicks the offending code gave identical run-time
results when compiled with gcc-4.9.2 and clang-3.5.0.  Rewriting the
sample code so that results matched both compilers was used to check
the validity of this change.
merge-requests/1/head
Johannes Meixner 2009-07-30 20:30:00 +09:00 zatwierdzone przez Olaf Meeuwissen
rodzic 5cae68b574
commit f219f7fbd8
1 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
backend/mustek_pp_ccd300.c
Wyświetl plik

@ -940,10 +940,10 @@ get_color_line_101x (Mustek_pp_Handle * dev, SANE_Byte * buf)
wait_bank_change (dev, priv->bank_count, 1); wait_bank_change (dev, priv->bank_count, 1);
reset_bank_count (dev); reset_bank_count (dev);
if (priv->ccd_line >= (priv->line_step >> SANE_FIXED_SCALE_SHIFT)) if (priv->ccd_line >= (priv->line_step >> SANE_FIXED_SCALE_SHIFT))
priv->redline = ++priv->redline % priv->green_offs; priv->redline = (priv->redline + 1) % priv->green_offs;
if (priv->ccd_line >= if (priv->ccd_line >=
priv->blue_offs + (priv->line_step >> SANE_FIXED_SCALE_SHIFT)) priv->blue_offs + (priv->line_step >> SANE_FIXED_SCALE_SHIFT))
priv->blueline = ++priv->blueline % priv->blue_offs; priv->blueline = (priv->blueline + 1) % priv->blue_offs;
continue; continue;
} }
@ -979,7 +979,7 @@ get_color_line_101x (Mustek_pp_Handle * dev, SANE_Byte * buf)
} }
priv->redline = ++priv->redline % priv->green_offs; priv->redline = (priv->redline + 1) % priv->green_offs;
if (priv->ccd_line >= priv->green_offs && gogreen) if (priv->ccd_line >= priv->green_offs && gogreen)
{ {
@ -1013,7 +1013,7 @@ get_color_line_101x (Mustek_pp_Handle * dev, SANE_Byte * buf)
if (priv->ccd_line >= if (priv->ccd_line >=
priv->blue_offs + (priv->line_step >> SANE_FIXED_SCALE_SHIFT)) priv->blue_offs + (priv->line_step >> SANE_FIXED_SCALE_SHIFT))
priv->blueline = ++priv->blueline % priv->blue_offs; priv->blueline = (priv->blueline + 1) % priv->blue_offs;
if (gogreen) if (gogreen)
{ {