[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/ftglue.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5e4ea1104c9b832046cc8dde5ea7da52aaa61143
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Feb 22 16:50:13 2012 +0900

    Do not update stream->pos when seeking is failed.

diff --git a/src/ftglue.c b/src/ftglue.c
index d5af810..7c643d0 100644
--- a/src/ftglue.c
+++ b/src/ftglue.c
@@ -82,7 +82,6 @@ ftglue_stream_seek( FT_Stream   stream,
 {
   FT_Error  error = 0;
 
-  stream->pos = pos;
   if ( stream->read )
   {
     if ( stream->read( stream, pos, 0, 0 ) )
@@ -91,6 +90,8 @@ ftglue_stream_seek( FT_Stream   stream,
   else if ( pos > stream->size )
     error = FT_Err_Invalid_Stream_Operation;
 
+  if ( !error )
+    stream->pos = pos;
   LOG(( "ftglue:stream:seek(%ld) -> %d\n", pos, error ));
   return error;
 }