[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19836] branches/sim_physics/source/ blender/imbuf/intern/IMB_jp2.h: 4th: another file corrupted

[Daniel Genrich]

Revision: 19836
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19836
Author:   genscher
Date:     2009-04-21 11:31:07 +0200 (Tue, 21 Apr 2009)

Log Message:
-----------
4th: another file corrupted

Modified Paths:
--------------
    branches/sim_physics/source/blender/imbuf/intern/IMB_jp2.h

Modified: branches/sim_physics/source/blender/imbuf/intern/IMB_jp2.h
===================================================================
--- branches/sim_physics/source/blender/imbuf/intern/IMB_jp2.h	2009-04-21 09:20:47 UTC (rev 19835)
+++ branches/sim_physics/source/blender/imbuf/intern/IMB_jp2.h	2009-04-21 09:31:07 UTC (rev 19836)
@@ -1,62 +1,7 @@
-<<<<<<< .working
 /*
  * IMB_jp2.h
  *
-<<<<<<< .working
- * $Id: IMB_jp2.h 19805 2009-04-20 00:19:16Z genscher $
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-/**
- * \file IMB_jp2.h
- * \ingroup imbuf
- * \brief Function declarations for jp2.c
- */
-
-#ifndef IMB_JP2_H
-#define IMB_JP2_H
-
-#ifdef WITH_OPENJPEG
-struct ImBuf;
-
-int imb_is_a_jp2(void *buf);
-struct ImBuf *imb_jp2_decode(unsigned char *mem, int size, int flags);
-short imb_savejp2(struct ImBuf *ibuf, char *name, int flags);
-#endif /* WITH_OPENJPEG */
-
-#endif
-
-=======
-/*
- * IMB_jp2.h
- *
  * $Id: IMB_bmp.h 14444 2008-04-16 22:40:48Z hos $
-=======
- * $Id$
->>>>>>> .merge-right.r19825
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -102,4 +47,3 @@
 
 #endif
 
->>>>>>> .merge-right.r19804