X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmopenjpeg%2Flibopenjpeg%2Ffix.c;h=81cc5f1fede3b2a6c7fbeb0e44d6fbea3ad46d08;hb=4c0fe0142482ede7dd8f5408f9303d78c213435b;hp=12ef6a7e66cccc0fb1c68fa0bf9186ed429bfe69;hpb=7452f3039ff4dd2574fcbf3343b530a2f20f9623;p=gdcm.git diff --git a/src/gdcmopenjpeg/libopenjpeg/fix.c b/src/gdcmopenjpeg/libopenjpeg/fix.c index 12ef6a7e..81cc5f1f 100644 --- a/src/gdcmopenjpeg/libopenjpeg/fix.c +++ b/src/gdcmopenjpeg/libopenjpeg/fix.c @@ -25,7 +25,7 @@ */ #include "fix.h" -#include //Add Antonin : multbug1 +#include /*Add Antonin : multbug1*/ #ifdef WIN32 #define int64 __int64 @@ -37,13 +37,13 @@ * Multiply two fixed-precision rational numbers. */ -//int fix_mul(int a, int b) -//{ -// return (int) ((int64) a * (int64) b >> 13); -//} +/*int fix_mul(int a, int b) +{ + return (int) ((int64) a * (int64) b >> 13); +}*/ -//Mod Antonin : multbug1 +/*Mod Antonin : multbug1*/ /* int fix_mul(int a, int b) { @@ -53,9 +53,9 @@ int fix_mul(int a, int b) return (int) v; } */ -//doM +/*doM*/ -int fix_mul(int a, int b) // Luke Lee optimized : 11/16/2004 +int fix_mul(int a, int b) /* Luke Lee optimized : 11/16/2004*/ { int64 temp = (int64) a * (int64) b >> 12; return (int) ((temp >> 1) + (temp & 1)) ;