Applied patch from Piers Taylor
git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@353533 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
bf13664a25
commit
7553198a32
@ -1,57 +1,19 @@
|
|||||||
/*
|
/* ====================================================================
|
||||||
* ====================================================================
|
Copyright 2003-2004 Apache Software Foundation
|
||||||
* The Apache Software License, Version 1.1
|
|
||||||
*
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* Copyright (c) 2003 The Apache Software Foundation. All rights
|
you may not use this file except in compliance with the License.
|
||||||
* reserved.
|
You may obtain a copy of the License at
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
Unless required by applicable law or agreed to in writing, software
|
||||||
*
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* notice, this list of conditions and the following disclaimer.
|
See the License for the specific language governing permissions and
|
||||||
*
|
limitations under the License.
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
==================================================================== */
|
||||||
* notice, this list of conditions and the following disclaimer in
|
|
||||||
* the documentation and/or other materials provided with the
|
|
||||||
* distribution.
|
|
||||||
*
|
|
||||||
* 3. The end-user documentation included with the redistribution,
|
|
||||||
* if any, must include the following acknowledgment:
|
|
||||||
* "This product includes software developed by the
|
|
||||||
* Apache Software Foundation (http://www.apache.org/)."
|
|
||||||
* Alternately, this acknowledgment may appear in the software itself,
|
|
||||||
* if and wherever such third-party acknowledgments normally appear.
|
|
||||||
*
|
|
||||||
* 4. The names "Apache" and "Apache Software Foundation" and
|
|
||||||
* "Apache POI" must not be used to endorse or promote products
|
|
||||||
* derived from this software without prior written permission. For
|
|
||||||
* written permission, please contact apache@apache.org.
|
|
||||||
*
|
|
||||||
* 5. Products derived from this software may not be called "Apache",
|
|
||||||
* "Apache POI", nor may "Apache" appear in their name, without
|
|
||||||
* prior written permission of the Apache Software Foundation.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
|
|
||||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
|
|
||||||
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
||||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
||||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
|
||||||
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
||||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
|
||||||
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
||||||
* SUCH DAMAGE.
|
|
||||||
* ====================================================================
|
|
||||||
*
|
|
||||||
* This software consists of voluntary contributions made by many
|
|
||||||
* individuals on behalf of the Apache Software Foundation. For more
|
|
||||||
* information on the Apache Software Foundation, please see
|
|
||||||
* <http://www.apache.org/>.
|
|
||||||
*/
|
|
||||||
package org.apache.poi.util;
|
package org.apache.poi.util;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@ -136,7 +98,7 @@ public class LittleEndian
|
|||||||
*@return The shortArray value
|
*@return The shortArray value
|
||||||
*/
|
*/
|
||||||
public static short[] getShortArray(final byte[] data, final int offset) {
|
public static short[] getShortArray(final byte[] data, final int offset) {
|
||||||
int size = (short) getNumber(data, offset, SHORT_SIZE);
|
int size = (int) getNumber(data, offset, SHORT_SIZE);
|
||||||
short[] results = getSimpleShortArray(data, offset, size);
|
short[] results = getSimpleShortArray(data, offset, size);
|
||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user