Fixed initial line whitespace.

13 files changed, 124 insertions, 104 deletions

diff --git a/apps/mozilla/npapi.h b/apps/mozilla/npapi.h
index 0ccef715..63eb4f7f 100644
--- a/apps/mozilla/npapi.h
+++ b/apps/mozilla/npapi.h
@@ -223,7 +223,7 @@ typedef struct _NPWindow
     uint32  width;    /* Maximum window size */
     uint32  height;
     NPRect  clipRect; /* Clipping rectangle in port coordinates */
-            /* Used by MAC only.        */
+	    /* Used by MAC only.        */
 #ifdef XP_UNIX
     void *  ws_info;  /* Platform-dependent additonal data */
 #endif /* XP_UNIX */
@@ -234,9 +234,9 @@ typedef struct _NPWindow
 typedef struct _NPFullPrint
 {
     NPBool  pluginPrinted;  /* Set TRUE if plugin handled fullscreen */
-              /*  printing               */
+			    /*  printing               */
     NPBool  printOne;   /* TRUE if plugin should print one copy  */
-              /*  to default printer           */
+			/*  to default printer           */
     void* platformPrint;  /* Platform-specific printing info */
 } NPFullPrint;
 
@@ -398,54 +398,54 @@ char*         NPP_GetMIMEDescription(void);
 NPError    NPP_Initialize(void);
 void       NPP_Shutdown(void);
 NPError     NP_LOADDS NPP_New(NPMIMEType pluginType, NPP instance,
-                uint16 mode, int16 argc, char* argn[],
-                char* argv[], NPSavedData* saved);
+		uint16 mode, int16 argc, char* argn[],
+		char* argv[], NPSavedData* saved);
 NPError     NP_LOADDS NPP_Destroy(NPP instance, NPSavedData** save);
 NPError     NP_LOADDS NPP_SetWindow(NPP instance, NPWindow* window);
 NPError     NP_LOADDS NPP_NewStream(NPP instance, NPMIMEType type,
-                    NPStream* stream, NPBool seekable,
-                    uint16* stype);
+		NPStream* stream, NPBool seekable,
+		uint16* stype);
 NPError     NP_LOADDS NPP_DestroyStream(NPP instance, NPStream* stream,
-                      NPReason reason);
+		NPReason reason);
 int32     NP_LOADDS NPP_WriteReady(NPP instance, NPStream* stream);
 int32     NP_LOADDS NPP_Write(NPP instance, NPStream* stream, int32 offset,
-                  int32 len, void* buffer);
+		int32 len, void* buffer);
 void      NP_LOADDS NPP_StreamAsFile(NPP instance, NPStream* stream,
-                     const char* fname);
+		const char* fname);
 void      NP_LOADDS NPP_Print(NPP instance, NPPrint* platformPrint);
 int16     NPP_HandleEvent(NPP instance, void* event);
 void      NP_LOADDS NPP_URLNotify(NPP instance, const char* url,
-                    NPReason reason, void* notifyData);
+		NPReason reason, void* notifyData);
 jref      NP_LOADDS     NPP_GetJavaClass(void);
 NPError         NPP_GetValue(void *instance, NPPVariable variable,
-                   void *value);
+		void *value);
 NPError         NPP_SetValue(void *instance, NPNVariable variable,
-                   void *value);
+		void *value);
 
 /*
  * NPN_* functions are provided by the navigator and called by the plugin.
  */
 
 void    NPN_Version(int* plugin_major, int* plugin_minor,
-              int* netscape_major, int* netscape_minor);
+		int* netscape_major, int* netscape_minor);
 NPError   NPN_GetURLNotify(NPP instance, const char* url,
-                 const char* target, void* notifyData);
+		const char* target, void* notifyData);
 NPError   NPN_GetURL(NPP instance, const char* url,
-               const char* target);
+		const char* target);
 NPError   NPN_PostURLNotify(NPP instance, const char* url,
-                  const char* target, uint32 len,
-                  const char* buf, NPBool file,
-                  void* notifyData);
+		const char* target, uint32 len,
+		const char* buf, NPBool file,
+		void* notifyData);
 NPError   NPN_PostURL(NPP instance, const char* url,
-              const char* target, uint32 len,
-              const char* buf, NPBool file);
+		const char* target, uint32 len,
+		const char* buf, NPBool file);
 NPError   NPN_RequestRead(NPStream* stream, NPByteRange* rangeList);
 NPError   NPN_NewStream(NPP instance, NPMIMEType type,
-                const char* target, NPStream** stream);
+		const char* target, NPStream** stream);
 int32   NPN_Write(NPP instance, NPStream* stream, int32 len,
-              void* buffer);
+		void* buffer);
 NPError     NPN_DestroyStream(NPP instance, NPStream* stream,
-                  NPReason reason);
+		NPReason reason);
 void    NPN_Status(NPP instance, const char* message);
 const char* NPN_UserAgent(NPP instance);
 void*   NPN_MemAlloc(uint32 size);
@@ -455,9 +455,9 @@ void      NPN_ReloadPlugins(NPBool reloadPages);
 JRIEnv*     NPN_GetJavaEnv(void);
 jref      NPN_GetJavaPeer(NPP instance);
 NPError     NPN_GetValue(NPP instance, NPNVariable variable,
-               void *value);
+		void *value);
 NPError     NPN_SetValue(NPP instance, NPPVariable variable,
-               void *value);
+		void *value);
 void    NPN_InvalidateRect(NPP instance, NPRect *invalidRect);
 void    NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion);
 void    NPN_ForceRedraw(NPP instance);
diff --git a/apps/mozilla/npupp.h b/apps/mozilla/npupp.h
index 30066065..203bfc77 100644
--- a/apps/mozilla/npupp.h
+++ b/apps/mozilla/npupp.h
@@ -20,10 +20,10 @@
 
 /******************************************************************************************
    plug-in function table macros
-          for each function in and out of the plugin API we define
-                    typedef NPP_FooUPP
-          #define NewNPP_FooProc
-          #define CallNPP_FooProc
+	    for each function in and out of the plugin API we define
+		    typedef NPP_FooUPP
+	    #define NewNPP_FooProc
+	    #define CallNPP_FooProc
       for mac, define the UPP magic for PPC/68K calling
  *******************************************************************************************/
 
@@ -103,7 +103,7 @@ enum {
     (NPP_NewUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_NewProcInfo, GetCurrentArchitecture())
 #define CallNPP_NewProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
     (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_NewProcInfo, \
-                   (ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
+		    (ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
 #else
 
 typedef NPError (*NPP_NewUPP)(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved);
@@ -759,23 +759,23 @@ typedef void (*NPN_StatusUPP)(NPP instance, const char* message);
 
 typedef UniversalProcPtr NPN_UserAgentUPP;
 enum {
-        uppNPN_UserAgentProcInfo = kThinkCStackBased
-                | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-                | RESULT_SIZE(SIZE_CODE(sizeof(const char *)))
+	uppNPN_UserAgentProcInfo = kThinkCStackBased
+		| STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
+		| RESULT_SIZE(SIZE_CODE(sizeof(const char *)))
 };
 
 #define NewNPN_UserAgentProc(FUNC)              \
-                (NPN_UserAgentUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_UserAgentProcInfo, GetCurrentArchitecture())
+		(NPN_UserAgentUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_UserAgentProcInfo, GetCurrentArchitecture())
 #define CallNPN_UserAgentProc(FUNC, ARG1)               \
-                (const char*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_UserAgentProcInfo, (ARG1))
+		(const char*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_UserAgentProcInfo, (ARG1))
 
 #else
 
 typedef const char* (*NPN_UserAgentUPP)(NPP instance);
 #define NewNPN_UserAgentProc(FUNC)              \
-                ((NPN_UserAgentUPP) (FUNC))
+		((NPN_UserAgentUPP) (FUNC))
 #define CallNPN_UserAgentProc(FUNC, ARG1)               \
-                (*(FUNC))((ARG1))
+		(*(FUNC))((ARG1))
 
 #endif
 
diff --git a/apps/pdftool.c b/apps/pdftool.c
index aa26dfe5..070bff1c 100644
--- a/apps/pdftool.c
+++ b/apps/pdftool.c
@@ -95,19 +95,19 @@ void opensrc(char *filename, char *password, int loadpages)
 
 void preloadobjstms(void)
 {
-        fz_error *error;
-        fz_obj *obj;
-        int i;
-
-        for (i = 0; i < src->len; i++)
-        {
-                if (src->table[i].type == 'o')
-                {
-                        error = pdf_loadobject(&obj, src, i, 0);
-                        if (error) die(error);
-                        fz_dropobj(obj);
-                }
-        }
+	fz_error *error;
+	fz_obj *obj;
+	int i;
+
+	for (i = 0; i < src->len; i++)
+	{
+		if (src->table[i].type == 'o')
+		{
+			error = pdf_loadobject(&obj, src, i, 0);
+			if (error) die(error);
+			fz_dropobj(obj);
+		}
+	}
 }
 
 /* --------------------------------------------------------------------- */
diff --git a/apps/unix/x11pdf.c b/apps/unix/x11pdf.c
index 537015f9..ae93a2fd 100644
--- a/apps/unix/x11pdf.c
+++ b/apps/unix/x11pdf.c
@@ -227,7 +227,7 @@ static void invertcopyrect()
 		p = (unsigned *)(gapp.image->samples + (y * gapp.image->w + x0) * 4);
 		for (x = x0; x < x1; x++)
 		{
-                        *p = ~0 - *p;
+			*p = ~0 - *p;
 			p ++;
 		}
 	}
@@ -530,7 +530,7 @@ int main(int argc, char **argv)
 				tmo.tv_sec == 0 && tmo.tv_usec == 0)
 			{
 				// redraw page
-                                winblit(&gapp);
+				winblit(&gapp);
 				isshowingpage = 0;
 				winresettmo(&tmo, &tmo_at);
 				continue;
diff --git a/base/base_cpudep.c b/base/base_cpudep.c
index 5f8e2294..c2b29672 100644
--- a/base/base_cpudep.c
+++ b/base/base_cpudep.c
@@ -254,6 +254,10 @@ void fz_cpudetect(void)
 
 	fz_cpuflags = flags;
 
+#if defined(ARCH_X86) || defined(ARCH_X86_64) 
+        __asm__ __volatile__ ("emms\n\t"); 
+#endif
+
 	dumpflags();
 }
 
diff --git a/include/pdfapp.h b/include/pdfapp.h
index bc7bfbb5..0d3c5ec6 100644
--- a/include/pdfapp.h
+++ b/include/pdfapp.h
@@ -58,8 +58,8 @@ struct pdfapp_s
 	int selx, sely;
 	fz_irect selr;
 
-        /* client context storage */
-        void *userdata;
+	/* client context storage */
+	void *userdata;
 };
 
 void pdfapp_init(pdfapp_t *app);
diff --git a/mupdf/pdf_crypt.c b/mupdf/pdf_crypt.c
index 8bef10a7..dd13ed9a 100644
--- a/mupdf/pdf_crypt.c
+++ b/mupdf/pdf_crypt.c
@@ -180,8 +180,8 @@ createkey(pdf_crypt *crypt, char *userpw, int pwlen)
 	fz_md5update(&md5, buf, 4);
 
 	/* Step 5 */
-	fz_md5update(&md5, (unsigned char *) fz_tostrbuf(crypt->id), 
-                fz_tostrlen(crypt->id));
+	fz_md5update(&md5, (unsigned char *) fz_tostrbuf(crypt->id),
+		fz_tostrlen(crypt->id));
 	fz_md5final(&md5, crypt->key);
 
 	/* Step 6 (rev 3 only) */
@@ -259,8 +259,8 @@ createuser(pdf_crypt *crypt, char *userpw, int pwlen)
 		fz_md5update(&md5, (unsigned char *)padding, 32);
 
 		/* Step 3 */
-		fz_md5update(&md5, (unsigned char *) fz_tostrbuf(crypt->id), 
-                        fz_tostrlen(crypt->id));
+		fz_md5update(&md5, (unsigned char *) fz_tostrbuf(crypt->id),
+			fz_tostrlen(crypt->id));
 		fz_md5final(&md5, key);
 
 		/* Step 4 */
diff --git a/mupdf/pdf_interpret.c b/mupdf/pdf_interpret.c
index 033095fb..02d08edb 100644
--- a/mupdf/pdf_interpret.c
+++ b/mupdf/pdf_interpret.c
@@ -65,37 +65,37 @@ clearstack(pdf_csi *csi)
 static pdf_material *
 pdf_keepmaterial(pdf_material *mat)
 {
-        if (mat->cs)
-                fz_keepcolorspace(mat->cs);
-        if (mat->indexed)
-                fz_keepcolorspace(&mat->indexed->super);
-        if (mat->pattern)
-                pdf_keeppattern(mat->pattern);
-        if (mat->shade)
-                fz_keepshade(mat->shade);
-
-        return mat;
+	if (mat->cs)
+		fz_keepcolorspace(mat->cs);
+	if (mat->indexed)
+		fz_keepcolorspace(&mat->indexed->super);
+	if (mat->pattern)
+		pdf_keeppattern(mat->pattern);
+	if (mat->shade)
+		fz_keepshade(mat->shade);
+
+	return mat;
 }
 
 static pdf_material *
 pdf_dropmaterial(pdf_material *mat)
 {
-        if (mat->cs)
-                fz_dropcolorspace(mat->cs);
-        if (mat->indexed)
-                fz_dropcolorspace(&mat->indexed->super);
-        if (mat->pattern)
-                pdf_droppattern(mat->pattern);
-        if (mat->shade)
-                fz_dropshade(mat->shade);
-
-        return mat;
+	if (mat->cs)
+		fz_dropcolorspace(mat->cs);
+	if (mat->indexed)
+		fz_dropcolorspace(&mat->indexed->super);
+	if (mat->pattern)
+		pdf_droppattern(mat->pattern);
+	if (mat->shade)
+		fz_dropshade(mat->shade);
+
+	return mat;
 }
 
 static fz_error *
 gsave(pdf_csi *csi)
 {
-        pdf_gstate *gs = csi->gstate + csi->gtop;
+	pdf_gstate *gs = csi->gstate + csi->gtop;
 
 	if (csi->gtop == 31)
 		return fz_throw("gstate overflow in content stream");
@@ -104,8 +104,8 @@ gsave(pdf_csi *csi)
 
 	csi->gtop ++;
 
-        pdf_keepmaterial(&gs->stroke);
-        pdf_keepmaterial(&gs->fill);
+	pdf_keepmaterial(&gs->stroke);
+	pdf_keepmaterial(&gs->fill);
 
 	return nil;
 }
@@ -113,13 +113,13 @@ gsave(pdf_csi *csi)
 static fz_error *
 grestore(pdf_csi *csi)
 {
-        pdf_gstate *gs = csi->gstate + csi->gtop;
+	pdf_gstate *gs = csi->gstate + csi->gtop;
 
 	if (csi->gtop == 0)
 		return fz_throw("gstate underflow in content stream");
 
-        pdf_dropmaterial(&gs->stroke);
-        pdf_dropmaterial(&gs->fill);
+	pdf_dropmaterial(&gs->stroke);
+	pdf_dropmaterial(&gs->fill);
 
 	csi->gtop --;
 
diff --git a/mupdf/pdf_page.c b/mupdf/pdf_page.c
index b8747ca6..25400f2f 100644
--- a/mupdf/pdf_page.c
+++ b/mupdf/pdf_page.c
@@ -216,18 +216,18 @@ pdf_loadpage(pdf_page **pagep, pdf_xref *xref, fz_obj *dict)
 	}
 
 	if (!getenv("DONTOPT"))
-        {
-            if (getenv("SHOWTREE"))
-                fz_debugtree(tree);
-
-            pdf_logpage("optimize tree\n");
-
-            error = fz_optimizetree(tree);
-            if (error) {
-                    fz_dropobj(rdb);
-                    return error;
-            }
-        }
+	{
+		if (getenv("SHOWTREE"))
+			fz_debugtree(tree);
+
+		pdf_logpage("optimize tree\n");
+
+		error = fz_optimizetree(tree);
+		if (error) {
+			fz_dropobj(rdb);
+			return error;
+		}
+	}
 	/*
 	 * Create page object
 	 */
@@ -252,8 +252,8 @@ pdf_loadpage(pdf_page **pagep, pdf_xref *xref, fz_obj *dict)
 
 	pdf_logpage("} %p\n", page);
 
-        if (getenv("SHOWTREE"))
-            fz_debugtree(tree);
+	if (getenv("SHOWTREE"))
+		fz_debugtree(tree);
 
 	return nil;
 }
diff --git a/raster/imagescale.c b/raster/imagescale.c
index bbe20565..7edb0cd2 100644
--- a/raster/imagescale.c
+++ b/raster/imagescale.c
@@ -212,7 +212,23 @@ fz_scalepixmap(fz_pixmap **dstp, fz_pixmap *src, int xdenom, int ydenom)
 	case 1: srowx = fz_srow1; scolx = fz_scol1; break;
 	case 2: srowx = fz_srow2; scolx = fz_scol2; break;
 	case 4: srowx = fz_srow4; scolx = fz_scol4; break;
-	case 5: srowx = fz_srow5; scolx = fz_scol5; break;
+	case 5: srowx = fz_srow5; scolx = fz_scol5;
+                if (!(xdenom & (xdenom - 1)))
+                {
+                        unsigned v = xdenom;
+                        xdenom = 0;
+                        while ((v >>= 1)) xdenom++;
+                        srowx = srow5p2;
+                }
+                if (!(ydenom & (ydenom - 1)))
+                {
+                        unsigned v = ydenom2;
+                        ydenom2 = 0;
+                        while ((v >>= 1)) ydenom2++;
+                        scolx = scol5p2;
+                }
+
+                break;
 	}
 
 	if (srowx && scolx)
diff --git a/raster/imageunpack.c b/raster/imageunpack.c
index 451967c8..591c4b60 100644
--- a/raster/imageunpack.c
+++ b/raster/imageunpack.c
@@ -28,7 +28,7 @@ static void decodetile(fz_pixmap *pix, int skip, float *decode)
 		min[i] = decode[(i - skip) * 2] * 255;
 		max[i] = decode[(i - skip) * 2 + 1] * 255;
 		sub[i] = max[i] - min[i];
-                needed |= (min[i] != 0) |  (max[i] != 255);
+		needed |= (min[i] != 0) |  (max[i] != 255);
 	}
 
 	if (!needed)
diff --git a/raster/render.c b/raster/render.c
index 803ba603..50e16d8a 100644
--- a/raster/render.c
+++ b/raster/render.c
@@ -792,8 +792,8 @@ rendernode(fz_renderer *gc, fz_node *node, fz_matrix ctm)
 		return rendernode(gc, ((fz_linknode*)node)->tree->root, ctm);
 	case FZ_NMETA:
 		return rendernode(gc, node->first, ctm);
-        case FZ_NBLEND:
-                return nil;
+	case FZ_NBLEND:
+		return nil;
 	}
 
 	return nil;
diff --git a/stream/obj_simple.c b/stream/obj_simple.c
index b87a3cf1..77a7bca8 100644
--- a/stream/obj_simple.c
+++ b/stream/obj_simple.c
@@ -294,7 +294,7 @@ fz_objcmp(fz_obj *a, fz_obj *b)
 		return 0;
 
 	case FZ_POINTER:
-                return (char *) a->u.p - (char *) b->u.p;
+		return (char *) a->u.p - (char *) b->u.p;
 	}
 	return 1;
 }