Merge changes from CUPS 1.5svn-r8950.

[thirdparty/cups.git] / driver / dither.c

diff --git a/driver/dither.c b/driver/dither.c
index 2391734422091e063930e06667f38b743b8a8e0b..dfefed7c1d872fa8c0c69324657f42e8eeace1a8 100644 (file)
--- a/driver/dither.c
+++ b/driver/dither.c
@@ -24,21 +24,7 @@
  */
 
 #include "driver.h"
-
-
-/*
- * Random number function to use, in order of preference...
- */
-
-#ifdef HAVE_RANDOM
-#  define RANDOM_FUNCTION      random
-#elif defined(HAVE_MRAND48)
-#  define RANDOM_FUNCTION      mrand48
-#elif defined(HAVE_LRAND48)
-#  define RANDOM_FUNCTION      lrand48
-#else
-#  define RANDOM_FUNCTION      rand
-#endif /* HAVE_RANDOM */
+#include <config.h>
 
 
 /*
@@ -169,8 +155,8 @@ cupsDitherLine(cups_dither_t    *d, /* I - Dither data */
 
       if (errrange > 1)
       {
-        errbase0 = errbase + (RANDOM_FUNCTION() % errrange);
-        errbase1 = errbase + (RANDOM_FUNCTION() % errrange);
+        errbase0 = errbase + (CUPS_RAND() % errrange);
+        errbase1 = errbase + (CUPS_RAND() % errrange);
       }
       else
         errbase0 = errbase1 = errbase;
@@ -263,8 +249,8 @@ cupsDitherLine(cups_dither_t    *d, /* I - Dither data */
 
       if (errrange > 1)
       {
-        errbase0 = errbase + (RANDOM_FUNCTION() % errrange);
-        errbase1 = errbase + (RANDOM_FUNCTION() % errrange);
+        errbase0 = errbase + (CUPS_RAND() % errrange);
+        errbase1 = errbase + (CUPS_RAND() % errrange);
       }
       else
         errbase0 = errbase1 = errbase;